Commit 070fb21e authored by Namjae Jeon's avatar Namjae Jeon

cifsd: Alignment should match open parenthesis

Fix warnings "Alignment should match open parenthesis" from
checkpatch.pl --strict.
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent fe30ea69
...@@ -37,7 +37,7 @@ static char NTLMSSP_OID_STR[NTLMSSP_OID_LEN] = { 0x2b, 0x06, 0x01, 0x04, 0x01, ...@@ -37,7 +37,7 @@ static char NTLMSSP_OID_STR[NTLMSSP_OID_LEN] = { 0x2b, 0x06, 0x01, 0x04, 0x01,
static bool static bool
asn1_subid_decode(const unsigned char **begin, const unsigned char *end, asn1_subid_decode(const unsigned char **begin, const unsigned char *end,
unsigned long *subid) unsigned long *subid)
{ {
const unsigned char *ptr = *begin; const unsigned char *ptr = *begin;
unsigned char ch; unsigned char ch;
...@@ -58,7 +58,7 @@ asn1_subid_decode(const unsigned char **begin, const unsigned char *end, ...@@ -58,7 +58,7 @@ asn1_subid_decode(const unsigned char **begin, const unsigned char *end,
} }
static bool asn1_oid_decode(const unsigned char *value, size_t vlen, static bool asn1_oid_decode(const unsigned char *value, size_t vlen,
unsigned long **oid, size_t *oidlen) unsigned long **oid, size_t *oidlen)
{ {
const unsigned char *iptr = value, *end = value + vlen; const unsigned char *iptr = value, *end = value + vlen;
unsigned long *optr; unsigned long *optr;
...@@ -106,9 +106,8 @@ static bool asn1_oid_decode(const unsigned char *value, size_t vlen, ...@@ -106,9 +106,8 @@ static bool asn1_oid_decode(const unsigned char *value, size_t vlen,
return false; return false;
} }
static bool static bool oid_eq(unsigned long *oid1, unsigned int oid1len,
oid_eq(unsigned long *oid1, unsigned int oid1len, unsigned long *oid2, unsigned int oid2len)
unsigned long *oid2, unsigned int oid2len)
{ {
if (oid1len != oid2len) if (oid1len != oid2len)
return false; return false;
...@@ -118,7 +117,7 @@ oid_eq(unsigned long *oid1, unsigned int oid1len, ...@@ -118,7 +117,7 @@ oid_eq(unsigned long *oid1, unsigned int oid1len,
int int
ksmbd_decode_negTokenInit(unsigned char *security_blob, int length, ksmbd_decode_negTokenInit(unsigned char *security_blob, int length,
struct ksmbd_conn *conn) struct ksmbd_conn *conn)
{ {
return asn1_ber_decoder(&spnego_negtokeninit_decoder, conn, return asn1_ber_decoder(&spnego_negtokeninit_decoder, conn,
security_blob, length); security_blob, length);
...@@ -126,7 +125,7 @@ ksmbd_decode_negTokenInit(unsigned char *security_blob, int length, ...@@ -126,7 +125,7 @@ ksmbd_decode_negTokenInit(unsigned char *security_blob, int length,
int int
ksmbd_decode_negTokenTarg(unsigned char *security_blob, int length, ksmbd_decode_negTokenTarg(unsigned char *security_blob, int length,
struct ksmbd_conn *conn) struct ksmbd_conn *conn)
{ {
return asn1_ber_decoder(&spnego_negtokentarg_decoder, conn, return asn1_ber_decoder(&spnego_negtokentarg_decoder, conn,
security_blob, length); security_blob, length);
...@@ -146,10 +145,7 @@ static int compute_asn_hdr_len_bytes(int len) ...@@ -146,10 +145,7 @@ static int compute_asn_hdr_len_bytes(int len)
return 0; return 0;
} }
static void encode_asn_tag(char *buf, static void encode_asn_tag(char *buf, unsigned int *ofs, char tag, char seq,
unsigned int *ofs,
char tag,
char seq,
int length) int length)
{ {
int i; int i;
...@@ -184,7 +180,7 @@ static void encode_asn_tag(char *buf, ...@@ -184,7 +180,7 @@ static void encode_asn_tag(char *buf,
} }
int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen, int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen,
char *ntlm_blob, int ntlm_blob_len) char *ntlm_blob, int ntlm_blob_len)
{ {
char *buf; char *buf;
unsigned int ofs = 0; unsigned int ofs = 0;
...@@ -225,7 +221,7 @@ int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen, ...@@ -225,7 +221,7 @@ int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen,
} }
int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen, int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen,
int neg_result) int neg_result)
{ {
char *buf; char *buf;
unsigned int ofs = 0; unsigned int ofs = 0;
...@@ -252,8 +248,8 @@ int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen, ...@@ -252,8 +248,8 @@ int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen,
return 0; return 0;
} }
int gssapi_this_mech(void *context, size_t hdrlen, int gssapi_this_mech(void *context, size_t hdrlen, unsigned char tag,
unsigned char tag, const void *value, size_t vlen) const void *value, size_t vlen)
{ {
unsigned long *oid; unsigned long *oid;
size_t oidlen; size_t oidlen;
...@@ -277,8 +273,8 @@ int gssapi_this_mech(void *context, size_t hdrlen, ...@@ -277,8 +273,8 @@ int gssapi_this_mech(void *context, size_t hdrlen,
return err; return err;
} }
int neg_token_init_mech_type(void *context, size_t hdrlen, int neg_token_init_mech_type(void *context, size_t hdrlen, unsigned char tag,
unsigned char tag, const void *value, size_t vlen) const void *value, size_t vlen)
{ {
struct ksmbd_conn *conn = context; struct ksmbd_conn *conn = context;
unsigned long *oid; unsigned long *oid;
...@@ -314,8 +310,8 @@ int neg_token_init_mech_type(void *context, size_t hdrlen, ...@@ -314,8 +310,8 @@ int neg_token_init_mech_type(void *context, size_t hdrlen,
return -EBADMSG; return -EBADMSG;
} }
int neg_token_init_mech_token(void *context, size_t hdrlen, int neg_token_init_mech_token(void *context, size_t hdrlen, unsigned char tag,
unsigned char tag, const void *value, size_t vlen) const void *value, size_t vlen)
{ {
struct ksmbd_conn *conn = context; struct ksmbd_conn *conn = context;
...@@ -328,8 +324,8 @@ int neg_token_init_mech_token(void *context, size_t hdrlen, ...@@ -328,8 +324,8 @@ int neg_token_init_mech_token(void *context, size_t hdrlen,
return 0; return 0;
} }
int neg_token_targ_resp_token(void *context, size_t hdrlen, int neg_token_targ_resp_token(void *context, size_t hdrlen, unsigned char tag,
unsigned char tag, const void *value, size_t vlen) const void *value, size_t vlen)
{ {
struct ksmbd_conn *conn = context; struct ksmbd_conn *conn = context;
......
...@@ -10,20 +10,12 @@ ...@@ -10,20 +10,12 @@
#ifndef __ASN1_H__ #ifndef __ASN1_H__
#define __ASN1_H__ #define __ASN1_H__
int ksmbd_decode_negTokenInit(unsigned char *security_blob, int ksmbd_decode_negTokenInit(unsigned char *security_blob, int length,
int length,
struct ksmbd_conn *conn); struct ksmbd_conn *conn);
int ksmbd_decode_negTokenTarg(unsigned char *security_blob, int length,
int ksmbd_decode_negTokenTarg(unsigned char *security_blob,
int length,
struct ksmbd_conn *conn); struct ksmbd_conn *conn);
int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen,
int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, char *ntlm_blob, int ntlm_blob_len);
u16 *buflen, int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen,
char *ntlm_blob,
int ntlm_blob_len);
int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer,
u16 *buflen,
int neg_result); int neg_result);
#endif /* __ASN1_H__ */ #endif /* __ASN1_H__ */
This diff is collapsed.
...@@ -35,56 +35,31 @@ struct ksmbd_session; ...@@ -35,56 +35,31 @@ struct ksmbd_session;
struct ksmbd_conn; struct ksmbd_conn;
struct kvec; struct kvec;
int ksmbd_crypt_message(struct ksmbd_conn *conn, int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov,
struct kvec *iov, unsigned int nvec, int enc);
unsigned int nvec,
int enc);
void ksmbd_copy_gss_neg_header(void *buf); void ksmbd_copy_gss_neg_header(void *buf);
int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf);
int ksmbd_auth_ntlm(struct ksmbd_session *sess, int ksmbd_auth_ntlmv2(struct ksmbd_session *sess, struct ntlmv2_resp *ntlmv2,
char *pw_buf); int blen, char *domain_name);
int ksmbd_auth_ntlmv2(struct ksmbd_session *sess,
struct ntlmv2_resp *ntlmv2,
int blen,
char *domain_name);
int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob, int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,
int blob_len, int blob_len, struct ksmbd_session *sess);
struct ksmbd_session *sess);
int ksmbd_decode_ntlmssp_neg_blob(struct negotiate_message *negblob, int ksmbd_decode_ntlmssp_neg_blob(struct negotiate_message *negblob,
int blob_len, int blob_len, struct ksmbd_session *sess);
struct ksmbd_session *sess);
unsigned int unsigned int
ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob, ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob,
struct ksmbd_session *sess); struct ksmbd_session *sess);
int ksmbd_krb5_authenticate(struct ksmbd_session *sess, char *in_blob,
int ksmbd_krb5_authenticate(struct ksmbd_session *sess, int in_len, char *out_blob, int *out_len);
char *in_blob, int in_len, int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov,
char *out_blob, int *out_len); int n_vec, char *sig);
int ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov,
int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, int n_vec, char *sig);
char *key,
struct kvec *iov,
int n_vec,
char *sig);
int ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn,
char *key,
struct kvec *iov,
int n_vec,
char *sig);
int ksmbd_gen_smb30_signingkey(struct ksmbd_session *sess); int ksmbd_gen_smb30_signingkey(struct ksmbd_session *sess);
int ksmbd_gen_smb311_signingkey(struct ksmbd_session *sess); int ksmbd_gen_smb311_signingkey(struct ksmbd_session *sess);
int ksmbd_gen_smb30_encryptionkey(struct ksmbd_session *sess); int ksmbd_gen_smb30_encryptionkey(struct ksmbd_session *sess);
int ksmbd_gen_smb311_encryptionkey(struct ksmbd_session *sess); int ksmbd_gen_smb311_encryptionkey(struct ksmbd_session *sess);
int ksmbd_gen_preauth_integrity_hash(struct ksmbd_conn *conn, char *buf,
int ksmbd_gen_preauth_integrity_hash(struct ksmbd_conn *conn,
char *buf,
__u8 *pi_hash); __u8 *pi_hash);
int ksmbd_gen_sd_hash(struct ksmbd_conn *conn, char *sd_buf, int len, int ksmbd_gen_sd_hash(struct ksmbd_conn *conn, char *sd_buf, int len,
__u8 *pi_hash); __u8 *pi_hash);
#endif #endif
...@@ -251,7 +251,8 @@ int ksmbd_init_buffer_pools(void) ...@@ -251,7 +251,8 @@ int ksmbd_init_buffer_pools(void)
goto out; goto out;
filp_cache = kmem_cache_create("ksmbd_file_cache", filp_cache = kmem_cache_create("ksmbd_file_cache",
sizeof(struct ksmbd_file), 0, SLAB_HWCACHE_ALIGN, NULL); sizeof(struct ksmbd_file), 0,
SLAB_HWCACHE_ALIGN, NULL);
if (!filp_cache) if (!filp_cache)
goto out; goto out;
......
...@@ -8,12 +8,9 @@ ...@@ -8,12 +8,9 @@
void *ksmbd_find_buffer(size_t size); void *ksmbd_find_buffer(size_t size);
void ksmbd_release_buffer(void *buffer); void ksmbd_release_buffer(void *buffer);
void *ksmbd_realloc_response(void *ptr, size_t old_sz, size_t new_sz); void *ksmbd_realloc_response(void *ptr, size_t old_sz, size_t new_sz);
void ksmbd_free_file_struct(void *filp); void ksmbd_free_file_struct(void *filp);
void *ksmbd_alloc_file_struct(void); void *ksmbd_alloc_file_struct(void);
void ksmbd_destroy_buffer_pools(void); void ksmbd_destroy_buffer_pools(void);
int ksmbd_init_buffer_pools(void); int ksmbd_init_buffer_pools(void);
......
...@@ -201,30 +201,30 @@ int ksmbd_conn_write(struct ksmbd_work *work) ...@@ -201,30 +201,30 @@ int ksmbd_conn_write(struct ksmbd_work *work)
} }
int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf, int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf,
unsigned int buflen, u32 remote_key, u64 remote_offset, unsigned int buflen, u32 remote_key, u64 remote_offset,
u32 remote_len) u32 remote_len)
{ {
int ret = -EINVAL; int ret = -EINVAL;
if (conn->transport->ops->rdma_read) if (conn->transport->ops->rdma_read)
ret = conn->transport->ops->rdma_read(conn->transport, ret = conn->transport->ops->rdma_read(conn->transport,
buf, buflen, buf, buflen,
remote_key, remote_offset, remote_key, remote_offset,
remote_len); remote_len);
return ret; return ret;
} }
int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf, int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf,
unsigned int buflen, u32 remote_key, u64 remote_offset, unsigned int buflen, u32 remote_key,
u32 remote_len) u64 remote_offset, u32 remote_len)
{ {
int ret = -EINVAL; int ret = -EINVAL;
if (conn->transport->ops->rdma_write) if (conn->transport->ops->rdma_write)
ret = conn->transport->ops->rdma_write(conn->transport, ret = conn->transport->ops->rdma_write(conn->transport,
buf, buflen, buf, buflen,
remote_key, remote_offset, remote_key, remote_offset,
remote_len); remote_len);
return ret; return ret;
} }
...@@ -250,7 +250,7 @@ bool ksmbd_conn_alive(struct ksmbd_conn *conn) ...@@ -250,7 +250,7 @@ bool ksmbd_conn_alive(struct ksmbd_conn *conn)
if (server_conf.deadtime > 0 && if (server_conf.deadtime > 0 &&
time_after(jiffies, conn->last_active + server_conf.deadtime)) { time_after(jiffies, conn->last_active + server_conf.deadtime)) {
ksmbd_debug(CONN, "No response from client in %lu minutes\n", ksmbd_debug(CONN, "No response from client in %lu minutes\n",
server_conf.deadtime / SMB_ECHO_INTERVAL); server_conf.deadtime / SMB_ECHO_INTERVAL);
return false; return false;
} }
return true; return true;
...@@ -390,7 +390,7 @@ static void stop_sessions(void) ...@@ -390,7 +390,7 @@ static void stop_sessions(void)
task = conn->transport->handler; task = conn->transport->handler;
if (task) if (task)
ksmbd_debug(CONN, "Stop session handler %s/%d\n", ksmbd_debug(CONN, "Stop session handler %s/%d\n",
task->comm, task_pid_nr(task)); task->comm, task_pid_nr(task));
conn->status = KSMBD_SESS_EXITING; conn->status = KSMBD_SESS_EXITING;
} }
read_unlock(&conn_list_lock); read_unlock(&conn_list_lock);
......
...@@ -118,13 +118,13 @@ struct ksmbd_transport_ops { ...@@ -118,13 +118,13 @@ struct ksmbd_transport_ops {
void (*disconnect)(struct ksmbd_transport *t); void (*disconnect)(struct ksmbd_transport *t);
int (*read)(struct ksmbd_transport *t, char *buf, unsigned int size); int (*read)(struct ksmbd_transport *t, char *buf, unsigned int size);
int (*writev)(struct ksmbd_transport *t, struct kvec *iovs, int niov, int (*writev)(struct ksmbd_transport *t, struct kvec *iovs, int niov,
int size, bool need_invalidate_rkey, int size, bool need_invalidate_rkey,
unsigned int remote_key); unsigned int remote_key);
int (*rdma_read)(struct ksmbd_transport *t, void *buf, unsigned int len, int (*rdma_read)(struct ksmbd_transport *t, void *buf, unsigned int len,
u32 remote_key, u64 remote_offset, u32 remote_len); u32 remote_key, u64 remote_offset, u32 remote_len);
int (*rdma_write)(struct ksmbd_transport *t, void *buf, int (*rdma_write)(struct ksmbd_transport *t, void *buf,
unsigned int len, u32 remote_key, u64 remote_offset, unsigned int len, u32 remote_key, u64 remote_offset,
u32 remote_len); u32 remote_len);
}; };
struct ksmbd_transport { struct ksmbd_transport {
...@@ -139,24 +139,20 @@ struct ksmbd_transport { ...@@ -139,24 +139,20 @@ struct ksmbd_transport {
bool ksmbd_conn_alive(struct ksmbd_conn *conn); bool ksmbd_conn_alive(struct ksmbd_conn *conn);
void ksmbd_conn_wait_idle(struct ksmbd_conn *conn); void ksmbd_conn_wait_idle(struct ksmbd_conn *conn);
struct ksmbd_conn *ksmbd_conn_alloc(void); struct ksmbd_conn *ksmbd_conn_alloc(void);
void ksmbd_conn_free(struct ksmbd_conn *conn); void ksmbd_conn_free(struct ksmbd_conn *conn);
bool ksmbd_conn_lookup_dialect(struct ksmbd_conn *c); bool ksmbd_conn_lookup_dialect(struct ksmbd_conn *c);
int ksmbd_conn_write(struct ksmbd_work *work); int ksmbd_conn_write(struct ksmbd_work *work);
int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf, int ksmbd_conn_rdma_read(struct ksmbd_conn *conn, void *buf,
unsigned int buflen, u32 remote_key, u64 remote_offset, unsigned int buflen, u32 remote_key, u64 remote_offset,
u32 remote_len); u32 remote_len);
int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf, int ksmbd_conn_rdma_write(struct ksmbd_conn *conn, void *buf,
unsigned int buflen, u32 remote_key, u64 remote_offset, unsigned int buflen, u32 remote_key, u64 remote_offset,
u32 remote_len); u32 remote_len);
void ksmbd_conn_enqueue_request(struct ksmbd_work *work); void ksmbd_conn_enqueue_request(struct ksmbd_work *work);
int ksmbd_conn_try_dequeue_request(struct ksmbd_work *work); int ksmbd_conn_try_dequeue_request(struct ksmbd_work *work);
void ksmbd_conn_init_server_callbacks(struct ksmbd_conn_ops *ops); void ksmbd_conn_init_server_callbacks(struct ksmbd_conn_ops *ops);
int ksmbd_conn_handler_loop(void *p); int ksmbd_conn_handler_loop(void *p);
int ksmbd_conn_transport_init(void); int ksmbd_conn_transport_init(void);
void ksmbd_conn_transport_destroy(void); void ksmbd_conn_transport_destroy(void);
......
...@@ -123,8 +123,8 @@ static struct ksmbd_crypto_ctx *ksmbd_find_crypto_ctx(void) ...@@ -123,8 +123,8 @@ static struct ksmbd_crypto_ctx *ksmbd_find_crypto_ctx(void)
spin_lock(&ctx_list.ctx_lock); spin_lock(&ctx_list.ctx_lock);
if (!list_empty(&ctx_list.idle_ctx)) { if (!list_empty(&ctx_list.idle_ctx)) {
ctx = list_entry(ctx_list.idle_ctx.next, ctx = list_entry(ctx_list.idle_ctx.next,
struct ksmbd_crypto_ctx, struct ksmbd_crypto_ctx,
list); list);
list_del(&ctx->list); list_del(&ctx->list);
spin_unlock(&ctx_list.ctx_lock); spin_unlock(&ctx_list.ctx_lock);
return ctx; return ctx;
......
...@@ -59,7 +59,6 @@ struct ksmbd_crypto_ctx { ...@@ -59,7 +59,6 @@ struct ksmbd_crypto_ctx {
#define CRYPTO_CCM(c) ((c)->ccmaes[CRYPTO_AEAD_AES_CCM]) #define CRYPTO_CCM(c) ((c)->ccmaes[CRYPTO_AEAD_AES_CCM])
void ksmbd_release_crypto_ctx(struct ksmbd_crypto_ctx *ctx); void ksmbd_release_crypto_ctx(struct ksmbd_crypto_ctx *ctx);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacmd5(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacmd5(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacsha256(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacsha256(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_cmacaes(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_cmacaes(void);
...@@ -67,10 +66,8 @@ struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha512(void); ...@@ -67,10 +66,8 @@ struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha512(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha256(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha256(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md4(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md4(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md5(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md5(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_gcm(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_gcm(void);
struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_ccm(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_ccm(void);
void ksmbd_crypto_destroy(void); void ksmbd_crypto_destroy(void);
int ksmbd_crypto_create(void); int ksmbd_crypto_create(void);
......
...@@ -39,13 +39,13 @@ void ksmbd_free_work_struct(struct ksmbd_work *work) ...@@ -39,13 +39,13 @@ void ksmbd_free_work_struct(struct ksmbd_work *work)
{ {
WARN_ON(work->saved_cred != NULL); WARN_ON(work->saved_cred != NULL);
if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_TBUF && if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_TBUF &&
work->set_trans_buf) work->set_trans_buf)
ksmbd_release_buffer(work->response_buf); ksmbd_release_buffer(work->response_buf);
else else
kvfree(work->response_buf); kvfree(work->response_buf);
if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_RBUF && if (server_conf.flags & KSMBD_GLOBAL_FLAG_CACHE_RBUF &&
work->set_read_buf) work->set_read_buf)
ksmbd_release_buffer(work->aux_payload_buf); ksmbd_release_buffer(work->aux_payload_buf);
else else
kvfree(work->aux_payload_buf); kvfree(work->aux_payload_buf);
...@@ -65,8 +65,8 @@ void ksmbd_work_pool_destroy(void) ...@@ -65,8 +65,8 @@ void ksmbd_work_pool_destroy(void)
int ksmbd_work_pool_init(void) int ksmbd_work_pool_init(void)
{ {
work_cache = kmem_cache_create("ksmbd_work_cache", work_cache = kmem_cache_create("ksmbd_work_cache",
sizeof(struct ksmbd_work), 0, sizeof(struct ksmbd_work), 0,
SLAB_HWCACHE_ALIGN, NULL); SLAB_HWCACHE_ALIGN, NULL);
if (!work_cache) if (!work_cache)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
...@@ -135,7 +135,7 @@ int parse_stream_name(char *filename, char **stream_name, int *s_type) ...@@ -135,7 +135,7 @@ int parse_stream_name(char *filename, char **stream_name, int *s_type)
} }
ksmbd_debug(SMB, "stream name : %s, stream type : %s\n", s_name, ksmbd_debug(SMB, "stream name : %s, stream type : %s\n", s_name,
stream_type); stream_type);
if (!strncasecmp("$data", stream_type, 5)) if (!strncasecmp("$data", stream_type, 5))
*s_type = DATA_STREAM; *s_type = DATA_STREAM;
else if (!strncasecmp("$index_allocation", stream_type, 17)) else if (!strncasecmp("$index_allocation", stream_type, 17))
...@@ -267,7 +267,8 @@ char *convert_to_unix_name(struct ksmbd_share_config *share, char *name) ...@@ -267,7 +267,8 @@ char *convert_to_unix_name(struct ksmbd_share_config *share, char *name)
} }
char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info, char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info,
const struct nls_table *local_nls, int *conv_len) const struct nls_table *local_nls,
int *conv_len)
{ {
char *conv; char *conv;
int sz = min(4 * d_info->name_len, PATH_MAX); int sz = min(4 * d_info->name_len, PATH_MAX);
...@@ -280,11 +281,8 @@ char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info, ...@@ -280,11 +281,8 @@ char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info,
return NULL; return NULL;
/* XXX */ /* XXX */
*conv_len = smbConvertToUTF16((__le16 *)conv, *conv_len = smbConvertToUTF16((__le16 *)conv, d_info->name,
d_info->name, d_info->name_len, local_nls, 0);
d_info->name_len,
local_nls,
0);
*conv_len *= 2; *conv_len *= 2;
/* We allocate buffer twice bigger than needed. */ /* We allocate buffer twice bigger than needed. */
......
...@@ -12,32 +12,23 @@ struct kstat; ...@@ -12,32 +12,23 @@ struct kstat;
struct ksmbd_file; struct ksmbd_file;
int match_pattern(const char *str, size_t len, const char *pattern); int match_pattern(const char *str, size_t len, const char *pattern);
int ksmbd_validate_filename(char *filename); int ksmbd_validate_filename(char *filename);
int parse_stream_name(char *filename, char **stream_name, int *s_type); int parse_stream_name(char *filename, char **stream_name, int *s_type);
char *convert_to_nt_pathname(char *filename, char *sharepath); char *convert_to_nt_pathname(char *filename, char *sharepath);
int get_nlink(struct kstat *st); int get_nlink(struct kstat *st);
void ksmbd_conv_path_to_unix(char *path); void ksmbd_conv_path_to_unix(char *path);
void ksmbd_strip_last_slash(char *path); void ksmbd_strip_last_slash(char *path);
void ksmbd_conv_path_to_windows(char *path); void ksmbd_conv_path_to_windows(char *path);
char *ksmbd_extract_sharename(char *treename); char *ksmbd_extract_sharename(char *treename);
char *convert_to_unix_name(struct ksmbd_share_config *share, char *name); char *convert_to_unix_name(struct ksmbd_share_config *share, char *name);
#define KSMBD_DIR_INFO_ALIGNMENT 8 #define KSMBD_DIR_INFO_ALIGNMENT 8
struct ksmbd_dir_info; struct ksmbd_dir_info;
char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info, char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info,
const struct nls_table *local_nls, const struct nls_table *local_nls,
int *conv_len); int *conv_len);
#define NTFS_TIME_OFFSET ((u64)(369 * 365 + 89) * 24 * 3600 * 10000000) #define NTFS_TIME_OFFSET ((u64)(369 * 365 + 89) * 24 * 3600 * 10000000)
struct timespec64 ksmbd_NTtimeToUnix(__le64 ntutc); struct timespec64 ksmbd_NTtimeToUnix(__le64 ntutc);
u64 ksmbd_UnixTimeToNT(struct timespec64 t); u64 ksmbd_UnixTimeToNT(struct timespec64 t);
long long ksmbd_systime(void); long long ksmbd_systime(void);
......
...@@ -185,7 +185,7 @@ int ndr_decode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da) ...@@ -185,7 +185,7 @@ int ndr_decode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da)
version2 = ndr_read_int32(n); version2 = ndr_read_int32(n);
if (da->version != version2) { if (da->version != version2) {
ksmbd_err("ndr version mismatched(version: %d, version2: %d)\n", ksmbd_err("ndr version mismatched(version: %d, version2: %d)\n",
da->version, version2); da->version, version2);
return -EINVAL; return -EINVAL;
} }
...@@ -235,7 +235,8 @@ static int ndr_encode_posix_acl_entry(struct ndr *n, struct xattr_smb_acl *acl) ...@@ -235,7 +235,8 @@ static int ndr_encode_posix_acl_entry(struct ndr *n, struct xattr_smb_acl *acl)
} }
int ndr_encode_posix_acl(struct ndr *n, struct inode *inode, int ndr_encode_posix_acl(struct ndr *n, struct inode *inode,
struct xattr_smb_acl *acl, struct xattr_smb_acl *def_acl) struct xattr_smb_acl *acl,
struct xattr_smb_acl *def_acl)
{ {
int ref_id = 0x00020000; int ref_id = 0x00020000;
...@@ -315,7 +316,7 @@ int ndr_decode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl) ...@@ -315,7 +316,7 @@ int ndr_decode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl)
version2 = ndr_read_int32(n); version2 = ndr_read_int32(n);
if (acl->version != version2) { if (acl->version != version2) {
ksmbd_err("ndr version mismatched(version: %d, version2: %d)\n", ksmbd_err("ndr version mismatched(version: %d, version2: %d)\n",
acl->version, version2); acl->version, version2);
return -EINVAL; return -EINVAL;
} }
......
...@@ -15,7 +15,8 @@ struct ndr { ...@@ -15,7 +15,8 @@ struct ndr {
int ndr_encode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da); int ndr_encode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da);
int ndr_decode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da); int ndr_decode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da);
int ndr_encode_posix_acl(struct ndr *n, struct inode *inode, int ndr_encode_posix_acl(struct ndr *n, struct inode *inode,
struct xattr_smb_acl *acl, struct xattr_smb_acl *def_acl); struct xattr_smb_acl *acl,
struct xattr_smb_acl *def_acl);
int ndr_encode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl); int ndr_encode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl);
int ndr_encode_v3_ntacl(struct ndr *n, struct xattr_ntacl *acl); int ndr_encode_v3_ntacl(struct ndr *n, struct xattr_ntacl *acl);
int ndr_decode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl); int ndr_decode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl);
This diff is collapsed.
...@@ -96,11 +96,10 @@ struct oplock_break_info { ...@@ -96,11 +96,10 @@ struct oplock_break_info {
}; };
int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, int smb_grant_oplock(struct ksmbd_work *work, int req_op_level,
u64 pid, struct ksmbd_file *fp, __u16 tid, u64 pid, struct ksmbd_file *fp, __u16 tid,
struct lease_ctx_info *lctx, int share_ret); struct lease_ctx_info *lctx, int share_ret);
void smb_break_all_levII_oplock(struct ksmbd_work *work, void smb_break_all_levII_oplock(struct ksmbd_work *work,
struct ksmbd_file *fp, int is_trunc); struct ksmbd_file *fp, int is_trunc);
int opinfo_write_to_read(struct oplock_info *opinfo); int opinfo_write_to_read(struct oplock_info *opinfo);
int opinfo_read_handle_to_read(struct oplock_info *opinfo); int opinfo_read_handle_to_read(struct oplock_info *opinfo);
int opinfo_write_to_none(struct oplock_info *opinfo); int opinfo_write_to_none(struct oplock_info *opinfo);
...@@ -124,10 +123,10 @@ void create_disk_id_rsp_buf(char *cc, __u64 file_id, __u64 vol_id); ...@@ -124,10 +123,10 @@ void create_disk_id_rsp_buf(char *cc, __u64 file_id, __u64 vol_id);
void create_posix_rsp_buf(char *cc, struct ksmbd_file *fp); void create_posix_rsp_buf(char *cc, struct ksmbd_file *fp);
struct create_context *smb2_find_context_vals(void *open_req, const char *str); struct create_context *smb2_find_context_vals(void *open_req, const char *str);
struct oplock_info *lookup_lease_in_table(struct ksmbd_conn *conn, struct oplock_info *lookup_lease_in_table(struct ksmbd_conn *conn,
char *lease_key); char *lease_key);
int find_same_lease_key(struct ksmbd_session *sess, struct ksmbd_inode *ci, int find_same_lease_key(struct ksmbd_session *sess, struct ksmbd_inode *ci,
struct lease_ctx_info *lctx); struct lease_ctx_info *lctx);
void destroy_lease_table(struct ksmbd_conn *conn); void destroy_lease_table(struct ksmbd_conn *conn);
int smb2_check_durable_oplock(struct ksmbd_file *fp, int smb2_check_durable_oplock(struct ksmbd_file *fp,
struct lease_ctx_info *lctx, char *name); struct lease_ctx_info *lctx, char *name);
#endif /* __KSMBD_OPLOCK_H */ #endif /* __KSMBD_OPLOCK_H */
...@@ -106,7 +106,7 @@ static inline int check_conn_state(struct ksmbd_work *work) ...@@ -106,7 +106,7 @@ static inline int check_conn_state(struct ksmbd_work *work)
#define TCP_HANDLER_ABORT 1 #define TCP_HANDLER_ABORT 1
static int __process_request(struct ksmbd_work *work, struct ksmbd_conn *conn, static int __process_request(struct ksmbd_work *work, struct ksmbd_conn *conn,
uint16_t *cmd) uint16_t *cmd)
{ {
struct smb_version_cmds *cmds; struct smb_version_cmds *cmds;
uint16_t command; uint16_t command;
...@@ -159,7 +159,7 @@ static int __process_request(struct ksmbd_work *work, struct ksmbd_conn *conn, ...@@ -159,7 +159,7 @@ static int __process_request(struct ksmbd_work *work, struct ksmbd_conn *conn,
} }
static void __handle_ksmbd_work(struct ksmbd_work *work, static void __handle_ksmbd_work(struct ksmbd_work *work,
struct ksmbd_conn *conn) struct ksmbd_conn *conn)
{ {
u16 command = 0; u16 command = 0;
int rc; int rc;
...@@ -222,8 +222,8 @@ static void __handle_ksmbd_work(struct ksmbd_work *work, ...@@ -222,8 +222,8 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
} }
} }
if (work->sess && (work->sess->sign || if (work->sess &&
smb3_11_final_sess_setup_resp(work) || (work->sess->sign || smb3_11_final_sess_setup_resp(work) ||
conn->ops->is_sign_req(work, command))) conn->ops->is_sign_req(work, command)))
conn->ops->set_sign_rsp(work); conn->ops->set_sign_rsp(work);
} while (is_chained_smb2_message(work)); } while (is_chained_smb2_message(work));
...@@ -416,7 +416,7 @@ int server_queue_ctrl_reset_work(void) ...@@ -416,7 +416,7 @@ int server_queue_ctrl_reset_work(void)
} }
static ssize_t stats_show(struct class *class, struct class_attribute *attr, static ssize_t stats_show(struct class *class, struct class_attribute *attr,
char *buf) char *buf)
{ {
/* /*
* Inc this each time you change stats output format, * Inc this each time you change stats output format,
...@@ -430,19 +430,15 @@ static ssize_t stats_show(struct class *class, struct class_attribute *attr, ...@@ -430,19 +430,15 @@ static ssize_t stats_show(struct class *class, struct class_attribute *attr,
"shutdown" "shutdown"
}; };
ssize_t sz = scnprintf(buf, ssize_t sz = scnprintf(buf, PAGE_SIZE, "%d %s %d %lu\n", stats_version,
PAGE_SIZE, state[server_conf.state], server_conf.tcp_port,
"%d %s %d %lu\n", server_conf.ipc_last_active / HZ);
stats_version,
state[server_conf.state],
server_conf.tcp_port,
server_conf.ipc_last_active / HZ);
return sz; return sz;
} }
static ssize_t kill_server_store(struct class *class, static ssize_t kill_server_store(struct class *class,
struct class_attribute *attr, const char *buf, struct class_attribute *attr, const char *buf,
size_t len) size_t len)
{ {
if (!sysfs_streq(buf, "hard")) if (!sysfs_streq(buf, "hard"))
return len; return len;
...@@ -458,11 +454,11 @@ static ssize_t kill_server_store(struct class *class, ...@@ -458,11 +454,11 @@ static ssize_t kill_server_store(struct class *class,
} }
static const char * const debug_type_strings[] = {"smb", "auth", "vfs", static const char * const debug_type_strings[] = {"smb", "auth", "vfs",
"oplock", "ipc", "conn", "oplock", "ipc", "conn",
"rdma"}; "rdma"};
static ssize_t debug_show(struct class *class, struct class_attribute *attr, static ssize_t debug_show(struct class *class, struct class_attribute *attr,
char *buf) char *buf)
{ {
ssize_t sz = 0; ssize_t sz = 0;
int i, pos = 0; int i, pos = 0;
...@@ -486,7 +482,7 @@ static ssize_t debug_show(struct class *class, struct class_attribute *attr, ...@@ -486,7 +482,7 @@ static ssize_t debug_show(struct class *class, struct class_attribute *attr,
} }
static ssize_t debug_store(struct class *class, struct class_attribute *attr, static ssize_t debug_store(struct class *class, struct class_attribute *attr,
const char *buf, size_t len) const char *buf, size_t len)
{ {
int i; int i;
......
...@@ -178,19 +178,19 @@ static char *smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr) ...@@ -178,19 +178,19 @@ static char *smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
*/ */
if (*off > 4096) { if (*off > 4096) {
ksmbd_debug(SMB, "offset %d too large, data area ignored\n", ksmbd_debug(SMB, "offset %d too large, data area ignored\n",
*off); *off);
*len = 0; *len = 0;
*off = 0; *off = 0;
} else if (*off < 0) { } else if (*off < 0) {
ksmbd_debug(SMB, ksmbd_debug(SMB,
"negative offset %d to data invalid ignore data area\n", "negative offset %d to data invalid ignore data area\n",
*off); *off);
*off = 0; *off = 0;
*len = 0; *len = 0;
} else if (*len < 0) { } else if (*len < 0) {
ksmbd_debug(SMB, ksmbd_debug(SMB,
"negative data length %d invalid, data area ignored\n", "negative data length %d invalid, data area ignored\n",
*len); *len);
*len = 0; *len = 0;
} else if (*len > 128 * 1024) { } else if (*len > 128 * 1024) {
ksmbd_debug(SMB, "data area larger than 128K: %d\n", *len); ksmbd_debug(SMB, "data area larger than 128K: %d\n", *len);
...@@ -228,7 +228,7 @@ static unsigned int smb2_calc_size(void *buf) ...@@ -228,7 +228,7 @@ static unsigned int smb2_calc_size(void *buf)
smb2_get_data_area_len(&offset, &data_length, hdr); smb2_get_data_area_len(&offset, &data_length, hdr);
ksmbd_debug(SMB, "SMB2 data length %d offset %d\n", data_length, ksmbd_debug(SMB, "SMB2 data length %d offset %d\n", data_length,
offset); offset);
if (data_length > 0) { if (data_length > 0) {
/* /*
...@@ -239,8 +239,8 @@ static unsigned int smb2_calc_size(void *buf) ...@@ -239,8 +239,8 @@ static unsigned int smb2_calc_size(void *buf)
*/ */
if (offset + 1 < len) if (offset + 1 < len)
ksmbd_debug(SMB, ksmbd_debug(SMB,
"data area offset %d overlaps SMB2 header %d\n", "data area offset %d overlaps SMB2 header %d\n",
offset + 1, len); offset + 1, len);
else else
len = offset + data_length; len = offset + data_length;
} }
...@@ -321,11 +321,11 @@ static int smb2_validate_credit_charge(struct smb2_hdr *hdr) ...@@ -321,11 +321,11 @@ static int smb2_validate_credit_charge(struct smb2_hdr *hdr)
calc_credit_num = DIV_ROUND_UP(max_len, SMB2_MAX_BUFFER_SIZE); calc_credit_num = DIV_ROUND_UP(max_len, SMB2_MAX_BUFFER_SIZE);
if (!credit_charge && max_len > SMB2_MAX_BUFFER_SIZE) { if (!credit_charge && max_len > SMB2_MAX_BUFFER_SIZE) {
ksmbd_err("credit charge is zero and payload size(%d) is bigger than 64K\n", ksmbd_err("credit charge is zero and payload size(%d) is bigger than 64K\n",
max_len); max_len);
return 1; return 1;
} else if (credit_charge < calc_credit_num) { } else if (credit_charge < calc_credit_num) {
ksmbd_err("credit charge : %d, calc_credit_num : %d\n", ksmbd_err("credit charge : %d, calc_credit_num : %d\n",
credit_charge, calc_credit_num); credit_charge, calc_credit_num);
return 1; return 1;
} }
...@@ -357,7 +357,7 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) ...@@ -357,7 +357,7 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
if (hdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) { if (hdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) {
ksmbd_debug(SMB, "Illegal structure size %u\n", ksmbd_debug(SMB, "Illegal structure size %u\n",
le16_to_cpu(hdr->StructureSize)); le16_to_cpu(hdr->StructureSize));
return 1; return 1;
} }
...@@ -372,8 +372,8 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) ...@@ -372,8 +372,8 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
(hdr->Status == 0 || pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2_LE)) { (hdr->Status == 0 || pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2_LE)) {
/* error packets have 9 byte structure size */ /* error packets have 9 byte structure size */
ksmbd_debug(SMB, ksmbd_debug(SMB,
"Illegal request size %u for command %d\n", "Illegal request size %u for command %d\n",
le16_to_cpu(pdu->StructureSize2), command); le16_to_cpu(pdu->StructureSize2), command);
return 1; return 1;
} else if (command == SMB2_OPLOCK_BREAK_HE && } else if (command == SMB2_OPLOCK_BREAK_HE &&
hdr->Status == 0 && hdr->Status == 0 &&
...@@ -381,8 +381,8 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) ...@@ -381,8 +381,8 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
le16_to_cpu(pdu->StructureSize2) != OP_BREAK_STRUCT_SIZE_21) { le16_to_cpu(pdu->StructureSize2) != OP_BREAK_STRUCT_SIZE_21) {
/* special case for SMB2.1 lease break message */ /* special case for SMB2.1 lease break message */
ksmbd_debug(SMB, ksmbd_debug(SMB,
"Illegal request size %d for oplock break\n", "Illegal request size %d for oplock break\n",
le16_to_cpu(pdu->StructureSize2)); le16_to_cpu(pdu->StructureSize2));
return 1; return 1;
} }
} }
...@@ -408,9 +408,9 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) ...@@ -408,9 +408,9 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
*/ */
if (clc_len < len) { if (clc_len < len) {
ksmbd_debug(SMB, ksmbd_debug(SMB,
"cli req padded more than expected. Length %d not %d for cmd:%d mid:%llu\n", "cli req padded more than expected. Length %d not %d for cmd:%d mid:%llu\n",
len, clc_len, command, len, clc_len, command,
le64_to_cpu(hdr->MessageId)); le64_to_cpu(hdr->MessageId));
return 0; return 0;
} }
...@@ -418,9 +418,9 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) ...@@ -418,9 +418,9 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work)
return 0; return 0;
ksmbd_debug(SMB, ksmbd_debug(SMB,
"cli req too short, len %d not %d. cmd:%d mid:%llu\n", "cli req too short, len %d not %d. cmd:%d mid:%llu\n",
len, clc_len, command, len, clc_len, command,
le64_to_cpu(hdr->MessageId)); le64_to_cpu(hdr->MessageId));
return 1; return 1;
} }
......
This diff is collapsed.
...@@ -98,7 +98,7 @@ int ksmbd_lookup_protocol_idx(char *str) ...@@ -98,7 +98,7 @@ int ksmbd_lookup_protocol_idx(char *str)
while (offt >= 0) { while (offt >= 0) {
if (!strncmp(str, smb_protos[offt].prot, len)) { if (!strncmp(str, smb_protos[offt].prot, len)) {
ksmbd_debug(SMB, "selected %s dialect idx = %d\n", ksmbd_debug(SMB, "selected %s dialect idx = %d\n",
smb_protos[offt].prot, offt); smb_protos[offt].prot, offt);
return smb_protos[offt].index; return smb_protos[offt].index;
} }
offt--; offt--;
...@@ -156,7 +156,7 @@ static bool supported_protocol(int idx) ...@@ -156,7 +156,7 @@ static bool supported_protocol(int idx)
return true; return true;
return (server_conf.min_protocol <= idx && return (server_conf.min_protocol <= idx &&
idx <= server_conf.max_protocol); idx <= server_conf.max_protocol);
} }
static char *next_dialect(char *dialect, int *next_off) static char *next_dialect(char *dialect, int *next_off)
...@@ -179,12 +179,12 @@ static int ksmbd_lookup_dialect_by_name(char *cli_dialects, __le16 byte_count) ...@@ -179,12 +179,12 @@ static int ksmbd_lookup_dialect_by_name(char *cli_dialects, __le16 byte_count)
do { do {
dialect = next_dialect(dialect, &next); dialect = next_dialect(dialect, &next);
ksmbd_debug(SMB, "client requested dialect %s\n", ksmbd_debug(SMB, "client requested dialect %s\n",
dialect); dialect);
if (!strcmp(dialect, smb_protos[i].name)) { if (!strcmp(dialect, smb_protos[i].name)) {
if (supported_protocol(smb_protos[i].index)) { if (supported_protocol(smb_protos[i].index)) {
ksmbd_debug(SMB, ksmbd_debug(SMB,
"selected %s dialect\n", "selected %s dialect\n",
smb_protos[i].name); smb_protos[i].name);
if (smb_protos[i].index == SMB1_PROT) if (smb_protos[i].index == SMB1_PROT)
return seq_num; return seq_num;
return smb_protos[i].prot_id; return smb_protos[i].prot_id;
...@@ -207,14 +207,14 @@ int ksmbd_lookup_dialect_by_id(__le16 *cli_dialects, __le16 dialects_count) ...@@ -207,14 +207,14 @@ int ksmbd_lookup_dialect_by_id(__le16 *cli_dialects, __le16 dialects_count)
count = le16_to_cpu(dialects_count); count = le16_to_cpu(dialects_count);
while (--count >= 0) { while (--count >= 0) {
ksmbd_debug(SMB, "client requested dialect 0x%x\n", ksmbd_debug(SMB, "client requested dialect 0x%x\n",
le16_to_cpu(cli_dialects[count])); le16_to_cpu(cli_dialects[count]));
if (le16_to_cpu(cli_dialects[count]) != if (le16_to_cpu(cli_dialects[count]) !=
smb_protos[i].prot_id) smb_protos[i].prot_id)
continue; continue;
if (supported_protocol(smb_protos[i].index)) { if (supported_protocol(smb_protos[i].index)) {
ksmbd_debug(SMB, "selected %s dialect\n", ksmbd_debug(SMB, "selected %s dialect\n",
smb_protos[i].name); smb_protos[i].name);
return smb_protos[i].prot_id; return smb_protos[i].prot_id;
} }
} }
...@@ -269,9 +269,12 @@ bool ksmbd_pdu_size_has_room(unsigned int pdu) ...@@ -269,9 +269,12 @@ bool ksmbd_pdu_size_has_room(unsigned int pdu)
} }
int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level, int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
struct ksmbd_file *dir, struct ksmbd_dir_info *d_info, struct ksmbd_file *dir,
char *search_pattern, int (*fn)(struct ksmbd_conn *, int, struct ksmbd_dir_info *d_info,
struct ksmbd_dir_info *, struct ksmbd_kstat *)) char *search_pattern,
int (*fn)(struct ksmbd_conn *, int,
struct ksmbd_dir_info *,
struct ksmbd_kstat *))
{ {
int i, rc = 0; int i, rc = 0;
struct ksmbd_conn *conn = work->conn; struct ksmbd_conn *conn = work->conn;
...@@ -297,8 +300,8 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level, ...@@ -297,8 +300,8 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
ksmbd_kstat.kstat = &kstat; ksmbd_kstat.kstat = &kstat;
ksmbd_vfs_fill_dentry_attrs(work, ksmbd_vfs_fill_dentry_attrs(work,
dir->filp->f_path.dentry->d_parent, dir->filp->f_path.dentry->d_parent,
&ksmbd_kstat); &ksmbd_kstat);
rc = fn(conn, info_level, d_info, &ksmbd_kstat); rc = fn(conn, info_level, d_info, &ksmbd_kstat);
if (rc) if (rc)
break; break;
...@@ -327,7 +330,7 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level, ...@@ -327,7 +330,7 @@ int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
* but the result is different with Windows 7's one. need to check. * but the result is different with Windows 7's one. need to check.
*/ */
int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname,
char *shortname) char *shortname)
{ {
const char *p; const char *p;
char base[9], extension[4]; char base[9], extension[4];
...@@ -390,7 +393,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, ...@@ -390,7 +393,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname,
else else
out[baselen + 4] = '\0'; out[baselen + 4] = '\0';
smbConvertToUTF16((__le16 *)shortname, out, PATH_MAX, smbConvertToUTF16((__le16 *)shortname, out, PATH_MAX,
conn->local_nls, 0); conn->local_nls, 0);
len = strlen(out) * 2; len = strlen(out) * 2;
return len; return len;
} }
...@@ -398,7 +401,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, ...@@ -398,7 +401,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname,
static int __smb2_negotiate(struct ksmbd_conn *conn) static int __smb2_negotiate(struct ksmbd_conn *conn)
{ {
return (conn->dialect >= SMB20_PROT_ID && return (conn->dialect >= SMB20_PROT_ID &&
conn->dialect <= SMB311_PROT_ID); conn->dialect <= SMB311_PROT_ID);
} }
static int smb_handle_negotiate(struct ksmbd_work *work) static int smb_handle_negotiate(struct ksmbd_work *work)
...@@ -467,11 +470,11 @@ static const char * const shared_mode_errors[] = { ...@@ -467,11 +470,11 @@ static const char * const shared_mode_errors[] = {
}; };
static void smb_shared_mode_error(int error, struct ksmbd_file *prev_fp, static void smb_shared_mode_error(int error, struct ksmbd_file *prev_fp,
struct ksmbd_file *curr_fp) struct ksmbd_file *curr_fp)
{ {
ksmbd_debug(SMB, "%s\n", shared_mode_errors[error]); ksmbd_debug(SMB, "%s\n", shared_mode_errors[error]);
ksmbd_debug(SMB, "Current mode: 0x%x Desired mode: 0x%x\n", ksmbd_debug(SMB, "Current mode: 0x%x Desired mode: 0x%x\n",
prev_fp->saccess, curr_fp->daccess); prev_fp->saccess, curr_fp->daccess);
} }
int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp) int ksmbd_smb_check_shared_mode(struct file *filp, struct ksmbd_file *curr_fp)
......
This diff is collapsed.
...@@ -269,7 +269,7 @@ static int handle_response(int type, void *payload, size_t sz) ...@@ -269,7 +269,7 @@ static int handle_response(int type, void *payload, size_t sz)
*/ */
if (entry->type + 1 != type) { if (entry->type + 1 != type) {
ksmbd_err("Waiting for IPC type %d, got %d. Ignore.\n", ksmbd_err("Waiting for IPC type %d, got %d. Ignore.\n",
entry->type + 1, type); entry->type + 1, type);
} }
entry->response = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO); entry->response = kvmalloc(sz, GFP_KERNEL | __GFP_ZERO);
...@@ -315,9 +315,8 @@ static int ipc_server_config_on_startup(struct ksmbd_startup_request *req) ...@@ -315,9 +315,8 @@ static int ipc_server_config_on_startup(struct ksmbd_startup_request *req)
req->ifc_list_sz); req->ifc_list_sz);
if (ret) { if (ret) {
ksmbd_err("Server configuration error: %s %s %s\n", ksmbd_err("Server configuration error: %s %s %s\n",
req->netbios_name, req->netbios_name, req->server_string,
req->server_string, req->work_group);
req->work_group);
return ret; return ret;
} }
...@@ -547,9 +546,9 @@ ksmbd_ipc_spnego_authen_request(const char *spnego_blob, int blob_len) ...@@ -547,9 +546,9 @@ ksmbd_ipc_spnego_authen_request(const char *spnego_blob, int blob_len)
struct ksmbd_tree_connect_response * struct ksmbd_tree_connect_response *
ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess, ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess,
struct ksmbd_share_config *share, struct ksmbd_share_config *share,
struct ksmbd_tree_connect *tree_conn, struct ksmbd_tree_connect *tree_conn,
struct sockaddr *peer_addr) struct sockaddr *peer_addr)
{ {
struct ksmbd_ipc_msg *msg; struct ksmbd_ipc_msg *msg;
struct ksmbd_tree_connect_request *req; struct ksmbd_tree_connect_request *req;
...@@ -588,7 +587,7 @@ ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess, ...@@ -588,7 +587,7 @@ ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess,
} }
int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id, int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id,
unsigned long long connect_id) unsigned long long connect_id)
{ {
struct ksmbd_ipc_msg *msg; struct ksmbd_ipc_msg *msg;
struct ksmbd_tree_disconnect_request *req; struct ksmbd_tree_disconnect_request *req;
...@@ -700,7 +699,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_close(struct ksmbd_session *sess, int handle ...@@ -700,7 +699,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_close(struct ksmbd_session *sess, int handle
} }
struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle, struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle,
void *payload, size_t payload_sz) void *payload, size_t payload_sz)
{ {
struct ksmbd_ipc_msg *msg; struct ksmbd_ipc_msg *msg;
struct ksmbd_rpc_command *req; struct ksmbd_rpc_command *req;
...@@ -748,7 +747,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle) ...@@ -748,7 +747,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle)
} }
struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle, struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle,
void *payload, size_t payload_sz) void *payload, size_t payload_sz)
{ {
struct ksmbd_ipc_msg *msg; struct ksmbd_ipc_msg *msg;
struct ksmbd_rpc_command *req; struct ksmbd_rpc_command *req;
...@@ -773,7 +772,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle ...@@ -773,7 +772,7 @@ struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle
} }
struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload, struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
size_t payload_sz) size_t payload_sz)
{ {
struct ksmbd_ipc_msg *msg; struct ksmbd_ipc_msg *msg;
struct ksmbd_rpc_command *req; struct ksmbd_rpc_command *req;
......
...@@ -23,31 +23,24 @@ ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess, ...@@ -23,31 +23,24 @@ ksmbd_ipc_tree_connect_request(struct ksmbd_session *sess,
struct ksmbd_share_config *share, struct ksmbd_share_config *share,
struct ksmbd_tree_connect *tree_conn, struct ksmbd_tree_connect *tree_conn,
struct sockaddr *peer_addr); struct sockaddr *peer_addr);
int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id, int ksmbd_ipc_tree_disconnect_request(unsigned long long session_id,
unsigned long long connect_id); unsigned long long connect_id);
int ksmbd_ipc_logout_request(const char *account); int ksmbd_ipc_logout_request(const char *account);
struct ksmbd_share_config_response * struct ksmbd_share_config_response *
ksmbd_ipc_share_config_request(const char *name); ksmbd_ipc_share_config_request(const char *name);
struct ksmbd_spnego_authen_response * struct ksmbd_spnego_authen_response *
ksmbd_ipc_spnego_authen_request(const char *spnego_blob, int blob_len); ksmbd_ipc_spnego_authen_request(const char *spnego_blob, int blob_len);
int ksmbd_ipc_id_alloc(void); int ksmbd_ipc_id_alloc(void);
void ksmbd_rpc_id_free(int handle); void ksmbd_rpc_id_free(int handle);
struct ksmbd_rpc_command *ksmbd_rpc_open(struct ksmbd_session *sess, int handle); struct ksmbd_rpc_command *ksmbd_rpc_open(struct ksmbd_session *sess, int handle);
struct ksmbd_rpc_command *ksmbd_rpc_close(struct ksmbd_session *sess, int handle); struct ksmbd_rpc_command *ksmbd_rpc_close(struct ksmbd_session *sess, int handle);
struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle, struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle,
void *payload, size_t payload_sz); void *payload, size_t payload_sz);
struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle); struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle);
struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle, struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle,
void *payload, size_t payload_sz); void *payload, size_t payload_sz);
struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload, struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
size_t payload_sz); size_t payload_sz);
void ksmbd_ipc_release(void); void ksmbd_ipc_release(void);
void ksmbd_ipc_soft_reset(void); void ksmbd_ipc_soft_reset(void);
int ksmbd_ipc_init(void); int ksmbd_ipc_init(void);
......
This diff is collapsed.
...@@ -113,7 +113,7 @@ static void free_transport(struct tcp_transport *t) ...@@ -113,7 +113,7 @@ static void free_transport(struct tcp_transport *t)
* Return: Number of IO segments * Return: Number of IO segments
*/ */
static unsigned int kvec_array_init(struct kvec *new, struct kvec *iov, static unsigned int kvec_array_init(struct kvec *new, struct kvec *iov,
unsigned int nr_segs, size_t bytes) unsigned int nr_segs, size_t bytes)
{ {
size_t base = 0; size_t base = 0;
...@@ -197,8 +197,9 @@ static int ksmbd_tcp_new_connection(struct socket *client_sk) ...@@ -197,8 +197,9 @@ static int ksmbd_tcp_new_connection(struct socket *client_sk)
} }
KSMBD_TRANS(t)->handler = kthread_run(ksmbd_conn_handler_loop, KSMBD_TRANS(t)->handler = kthread_run(ksmbd_conn_handler_loop,
KSMBD_TRANS(t)->conn, KSMBD_TRANS(t)->conn,
"ksmbd:%u", ksmbd_tcp_get_port(csin)); "ksmbd:%u",
ksmbd_tcp_get_port(csin));
if (IS_ERR(KSMBD_TRANS(t)->handler)) { if (IS_ERR(KSMBD_TRANS(t)->handler)) {
ksmbd_err("cannot start conn thread\n"); ksmbd_err("cannot start conn thread\n");
rc = PTR_ERR(KSMBD_TRANS(t)->handler); rc = PTR_ERR(KSMBD_TRANS(t)->handler);
...@@ -230,7 +231,7 @@ static int ksmbd_kthread_fn(void *p) ...@@ -230,7 +231,7 @@ static int ksmbd_kthread_fn(void *p)
break; break;
} }
ret = kernel_accept(iface->ksmbd_socket, &client_sk, ret = kernel_accept(iface->ksmbd_socket, &client_sk,
O_NONBLOCK); O_NONBLOCK);
mutex_unlock(&iface->sock_release_lock); mutex_unlock(&iface->sock_release_lock);
if (ret) { if (ret) {
if (ret == -EAGAIN) if (ret == -EAGAIN)
...@@ -265,8 +266,8 @@ static int ksmbd_tcp_run_kthread(struct interface *iface) ...@@ -265,8 +266,8 @@ static int ksmbd_tcp_run_kthread(struct interface *iface)
int rc; int rc;
struct task_struct *kthread; struct task_struct *kthread;
kthread = kthread_run(ksmbd_kthread_fn, (void *)iface, kthread = kthread_run(ksmbd_kthread_fn, (void *)iface, "ksmbd-%s",
"ksmbd-%s", iface->name); iface->name);
if (IS_ERR(kthread)) { if (IS_ERR(kthread)) {
rc = PTR_ERR(kthread); rc = PTR_ERR(kthread);
return rc; return rc;
...@@ -287,7 +288,7 @@ static int ksmbd_tcp_run_kthread(struct interface *iface) ...@@ -287,7 +288,7 @@ static int ksmbd_tcp_run_kthread(struct interface *iface)
* otherwise return error number * otherwise return error number
*/ */
static int ksmbd_tcp_readv(struct tcp_transport *t, struct kvec *iov_orig, static int ksmbd_tcp_readv(struct tcp_transport *t, struct kvec *iov_orig,
unsigned int nr_segs, unsigned int to_read) unsigned int nr_segs, unsigned int to_read)
{ {
int length = 0; int length = 0;
int total_read; int total_read;
...@@ -353,7 +354,8 @@ static int ksmbd_tcp_read(struct ksmbd_transport *t, char *buf, unsigned int to_ ...@@ -353,7 +354,8 @@ static int ksmbd_tcp_read(struct ksmbd_transport *t, char *buf, unsigned int to_
} }
static int ksmbd_tcp_writev(struct ksmbd_transport *t, struct kvec *iov, static int ksmbd_tcp_writev(struct ksmbd_transport *t, struct kvec *iov,
int nvecs, int size, bool need_invalidate, unsigned int remote_key) int nvecs, int size, bool need_invalidate,
unsigned int remote_key)
{ {
struct msghdr smb_msg = {.msg_flags = MSG_NOSIGNAL}; struct msghdr smb_msg = {.msg_flags = MSG_NOSIGNAL};
...@@ -401,7 +403,7 @@ static int create_socket(struct interface *iface) ...@@ -401,7 +403,7 @@ static int create_socket(struct interface *iface)
if (ret) { if (ret) {
ksmbd_err("Can't create socket for ipv6, try ipv4: %d\n", ret); ksmbd_err("Can't create socket for ipv6, try ipv4: %d\n", ret);
ret = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, ret = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP,
&ksmbd_socket); &ksmbd_socket);
if (ret) { if (ret) {
ksmbd_err("Can't create socket for ipv4: %d\n", ret); ksmbd_err("Can't create socket for ipv4: %d\n", ret);
goto out_error; goto out_error;
...@@ -432,10 +434,10 @@ static int create_socket(struct interface *iface) ...@@ -432,10 +434,10 @@ static int create_socket(struct interface *iface)
if (ipv4) if (ipv4)
ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin, ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin,
sizeof(sin)); sizeof(sin));
else else
ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin6, ret = kernel_bind(ksmbd_socket, (struct sockaddr *)&sin6,
sizeof(sin6)); sizeof(sin6));
if (ret) { if (ret) {
ksmbd_err("Failed to bind socket: %d\n", ret); ksmbd_err("Failed to bind socket: %d\n", ret);
goto out_error; goto out_error;
...@@ -467,7 +469,7 @@ static int create_socket(struct interface *iface) ...@@ -467,7 +469,7 @@ static int create_socket(struct interface *iface)
} }
static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event, static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event,
void *ptr) void *ptr)
{ {
struct net_device *netdev = netdev_notifier_info_to_dev(ptr); struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
struct interface *iface; struct interface *iface;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment