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

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

fs/cifsd/asn1.c

+17 −21
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ static bool asn1_oid_decode(const unsigned char *value, size_t vlen, 
	return false;

}



static bool

oid_eq(unsigned long *oid1, unsigned int oid1len,

static bool oid_eq(unsigned long *oid1, unsigned int oid1len,

		   unsigned long *oid2, unsigned int oid2len)

{

	if (oid1len != oid2len)
@@ -146,10 +145,7 @@ static int compute_asn_hdr_len_bytes(int len) 
		return 0;

}



static void encode_asn_tag(char *buf,

			   unsigned int *ofs,

			   char tag,

			   char seq,

static void encode_asn_tag(char *buf, unsigned int *ofs, char tag, char seq,

			   int length)

{

	int i;
@@ -252,8 +248,8 @@ int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen, 
	return 0;

}



int gssapi_this_mech(void *context, size_t hdrlen,

		unsigned char tag, const void *value, size_t vlen)

int gssapi_this_mech(void *context, size_t hdrlen, unsigned char tag,

		     const void *value, size_t vlen)

{

	unsigned long *oid;

	size_t oidlen;
@@ -277,8 +273,8 @@ int gssapi_this_mech(void *context, size_t hdrlen, 
	return err;

}



int neg_token_init_mech_type(void *context, size_t hdrlen,

		unsigned char tag, const void *value, size_t vlen)

int neg_token_init_mech_type(void *context, size_t hdrlen, unsigned char tag,

			     const void *value, size_t vlen)

{

	struct ksmbd_conn *conn = context;

	unsigned long *oid;
@@ -314,8 +310,8 @@ int neg_token_init_mech_type(void *context, size_t hdrlen, 
	return -EBADMSG;

}



int neg_token_init_mech_token(void *context, size_t hdrlen,

		unsigned char tag, const void *value, size_t vlen)

int neg_token_init_mech_token(void *context, size_t hdrlen, unsigned char tag,

			      const void *value, size_t vlen)

{

	struct ksmbd_conn *conn = context;
@@ -328,8 +324,8 @@ int neg_token_init_mech_token(void *context, size_t hdrlen, 
	return 0;

}



int neg_token_targ_resp_token(void *context, size_t hdrlen,

		unsigned char tag, const void *value, size_t vlen)

int neg_token_targ_resp_token(void *context, size_t hdrlen, unsigned char tag,

			      const void *value, size_t vlen)

{

	struct ksmbd_conn *conn = context;

fs/cifsd/asn1.h

+5 −13
Original line number Diff line number Diff line
@@ -10,20 +10,12 @@ 
#ifndef __ASN1_H__

#define __ASN1_H__



int ksmbd_decode_negTokenInit(unsigned char *security_blob,

			      int length,

int ksmbd_decode_negTokenInit(unsigned char *security_blob, int length,

			      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);



int build_spnego_ntlmssp_neg_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 build_spnego_ntlmssp_neg_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);

#endif /* __ASN1_H__ */

fs/cifsd/auth.c

+55 −60
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key) 
	struct des_ctx ctx;



	if (fips_enabled) {

		ksmbd_debug(AUTH,

			"FIPS compliance enabled: DES not permitted\n");

		ksmbd_debug(AUTH, "FIPS compliance enabled: DES not permitted\n");

		return -ENOENT;

	}
@@ -226,15 +225,13 @@ static int ksmbd_gen_sess_key(struct ksmbd_session *sess, char *hash, 
				 hmac,

				 SMB2_NTLMV2_SESSKEY_SIZE);

	if (rc) {

		ksmbd_debug(AUTH, "Could not update with response error %d\n",

			rc);

		ksmbd_debug(AUTH, "Could not update with response error %d\n", rc);

		goto out;

	}



	rc = crypto_shash_final(CRYPTO_HMACMD5(ctx), sess->sess_key);

	if (rc) {

		ksmbd_debug(AUTH, "Could not generate hmacmd5 hash error %d\n",

			rc);

		ksmbd_debug(AUTH, "Could not generate hmacmd5 hash error %d\n", rc);

		goto out;

	}
@@ -350,8 +347,7 @@ int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf) 
		return rc;

	}



	ksmbd_enc_md4(sess->sess_key,

			user_passkey(sess->user),

	ksmbd_enc_md4(sess->sess_key, user_passkey(sess->user),

		      CIFS_SMB1_SESSKEY_SIZE);

	memcpy(sess->sess_key + CIFS_SMB1_SESSKEY_SIZE, key,

	       CIFS_AUTH_RESP_SIZE);
@@ -539,8 +535,7 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob, 
	/* process NTLMv2 authentication */

	ksmbd_debug(AUTH, "decode_ntlmssp_authenticate_blob dname%s\n",

		    domain_name);

	ret = ksmbd_auth_ntlmv2(sess,

			(struct ntlmv2_resp *)((char *)authblob + nt_off),

	ret = ksmbd_auth_ntlmv2(sess, (struct ntlmv2_resp *)((char *)authblob + nt_off),

				nt_len - CIFS_ENCPWD_SIZE,

				domain_name);

	kfree(domain_name);

fs/cifsd/auth.h

+16 −41
Original line number Diff line number Diff line
@@ -35,55 +35,30 @@ struct ksmbd_session; 
struct ksmbd_conn;

struct kvec;



int ksmbd_crypt_message(struct ksmbd_conn *conn,

			struct kvec *iov,

			unsigned int nvec,

			int enc);



int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov,

			unsigned int nvec, int enc);

void ksmbd_copy_gss_neg_header(void *buf);



int ksmbd_auth_ntlm(struct ksmbd_session *sess,

		    char *pw_buf);



int ksmbd_auth_ntlmv2(struct ksmbd_session *sess,

		      struct ntlmv2_resp *ntlmv2,

		      int blen,

		      char *domain_name);



int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf);

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 blob_len,

				   struct ksmbd_session *sess);



				   int blob_len, struct ksmbd_session *sess);

int ksmbd_decode_ntlmssp_neg_blob(struct negotiate_message *negblob,

				  int blob_len,

				  struct ksmbd_session *sess);



				  int blob_len, struct ksmbd_session *sess);

unsigned int

ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob,

				   struct ksmbd_session *sess);



int ksmbd_krb5_authenticate(struct ksmbd_session *sess,

			char *in_blob, int in_len,

			char *out_blob, int *out_len);



int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn,

			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_krb5_authenticate(struct ksmbd_session *sess, char *in_blob,

			    int in_len,	char *out_blob, int *out_len);

int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, 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_smb311_signingkey(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_preauth_integrity_hash(struct ksmbd_conn *conn,

				     char *buf,

int ksmbd_gen_preauth_integrity_hash(struct ksmbd_conn *conn, char *buf,

				     __u8 *pi_hash);

int ksmbd_gen_sd_hash(struct ksmbd_conn *conn, char *sd_buf, int len,

		      __u8 *pi_hash);

fs/cifsd/buffer_pool.c

+2 −1
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ int ksmbd_init_buffer_pools(void) 
		goto out;



	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)

		goto out;