Merge pull request #55 from namjaejeon/cifsd-for-next (be8bcf8b) · Commits · jan.koester / Linux

fs/cifsd/Makefile

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9,12 +9,12 @@ ksmbd-y := unicode.o auth.o vfs.o vfs_cache.o server.o buffer_pool.o \
	mgmt/ksmbd_ida.o mgmt/user_config.o mgmt/share_config.o \		mgmt/ksmbd_ida.o mgmt/user_config.o mgmt/share_config.o \
	mgmt/tree_connect.o mgmt/user_session.o smb_common.o \		mgmt/tree_connect.o mgmt/user_session.o smb_common.o \
	transport_tcp.o transport_ipc.o smbacl.o smb2pdu.o \		transport_tcp.o transport_ipc.o smbacl.o smb2pdu.o \
	smb2ops.o smb2misc.o spnego_negtokeninit.asn1.o \		smb2ops.o smb2misc.o ksmbd_spnego_negtokeninit.asn1.o \
	spnego_negtokentarg.asn1.o asn1.o ndr.o		ksmbd_spnego_negtokentarg.asn1.o asn1.o ndr.o

	$(obj)/asn1.o: $(obj)/spnego_negtokeninit.asn1.h $(obj)/spnego_negtokentarg.asn1.h		$(obj)/asn1.o: $(obj)/ksmbd_spnego_negtokeninit.asn1.h $(obj)/ksmbd_spnego_negtokentarg.asn1.h

	$(obj)/spnego_negtokeninit.asn1.o: $(obj)/spnego_negtokeninit.asn1.c $(obj)/spnego_negtokeninit.asn1.h		$(obj)/ksmbd_spnego_negtokeninit.asn1.o: $(obj)/ksmbd_spnego_negtokeninit.asn1.c $(obj)/ksmbd_spnego_negtokeninit.asn1.h
	$(obj)/spnego_negtokentarg.asn1.o: $(obj)/spnego_negtokentarg.asn1.c $(obj)/spnego_negtokentarg.asn1.h		$(obj)/ksmbd_spnego_negtokentarg.asn1.o: $(obj)/ksmbd_spnego_negtokentarg.asn1.c $(obj)/ksmbd_spnego_negtokentarg.asn1.h

	ksmbd-$(CONFIG_SMB_SERVER_SMBDIRECT) += transport_rdma.o		ksmbd-$(CONFIG_SMB_SERVER_SMBDIRECT) += transport_rdma.o

fs/cifsd/asn1.c

+15 −12

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,8 @@
	#include "asn1.h"		#include "asn1.h"
	#include "connection.h"		#include "connection.h"
	#include "auth.h"		#include "auth.h"
	#include "spnego_negtokeninit.asn1.h"		#include "ksmbd_spnego_negtokeninit.asn1.h"
	#include "spnego_negtokentarg.asn1.h"		#include "ksmbd_spnego_negtokentarg.asn1.h"

	#define SPNEGO_OID_LEN 7		#define SPNEGO_OID_LEN 7
	#define NTLMSSP_OID_LEN 10		#define NTLMSSP_OID_LEN 10
	@@ -119,7 +119,7 @@ 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(&ksmbd_spnego_negtokeninit_decoder, conn,
	security_blob, length);		security_blob, length);
	}		}

	@@ -127,7 +127,7 @@ 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(&ksmbd_spnego_negtokentarg_decoder, conn,
	security_blob, length);		security_blob, length);
	}		}

	@@ -248,7 +248,7 @@ int build_spnego_ntlmssp_auth_blob(unsigned char *pbuffer, u16 buflen,
	return 0;		return 0;
	}		}

	int gssapi_this_mech(void *context, size_t hdrlen, unsigned char tag,		int ksmbd_gssapi_this_mech(void *context, size_t hdrlen, unsigned char tag,
	const void *value, size_t vlen)		const void *value, size_t vlen)
	{		{
	unsigned long *oid;		unsigned long *oid;
	@@ -273,8 +273,9 @@ int gssapi_this_mech(void *context, size_t hdrlen, unsigned char tag,
	return err;		return err;
	}		}

	int neg_token_init_mech_type(void *context, size_t hdrlen, unsigned char tag,		int ksmbd_neg_token_init_mech_type(void *context, size_t hdrlen,
	const void *value, size_t vlen)		unsigned char tag, const void *value,
			size_t vlen)
	{		{
	struct ksmbd_conn *conn = context;		struct ksmbd_conn *conn = context;
	unsigned long *oid;		unsigned long *oid;
	@@ -310,8 +311,9 @@ int neg_token_init_mech_type(void *context, size_t hdrlen, unsigned char tag,
	return -EBADMSG;		return -EBADMSG;
	}		}

	int neg_token_init_mech_token(void *context, size_t hdrlen, unsigned char tag,		int ksmbd_neg_token_init_mech_token(void *context, size_t hdrlen,
	const void *value, size_t vlen)		unsigned char tag, const void *value,
			size_t vlen)
	{		{
	struct ksmbd_conn *conn = context;		struct ksmbd_conn *conn = context;

	@@ -324,8 +326,9 @@ int neg_token_init_mech_token(void *context, size_t hdrlen, unsigned char tag,
	return 0;		return 0;
	}		}

	int neg_token_targ_resp_token(void *context, size_t hdrlen, unsigned char tag,		int ksmbd_neg_token_targ_resp_token(void *context, size_t hdrlen,
	const void *value, size_t vlen)		unsigned char tag, const void *value,
			size_t vlen)
	{		{
	struct ksmbd_conn *conn = context;		struct ksmbd_conn *conn = context;

fs/cifsd/spnego_negtokeninit.asn1→fs/cifsd/ksmbd_spnego_negtokeninit.asn1

+3 −15

Original line number	Original line	Diff line number	Diff line
	GSSAPI ::=		GSSAPI ::=
	[APPLICATION 0] IMPLICIT SEQUENCE {		[APPLICATION 0] IMPLICIT SEQUENCE {
	thisMech		thisMech
	OBJECT IDENTIFIER ({gssapi_this_mech}),		OBJECT IDENTIFIER ({ksmbd_gssapi_this_mech}),
	negotiationToken		negotiationToken
	NegotiationToken		NegotiationToken
	}		}

	MechType ::= OBJECT IDENTIFIER ({neg_token_init_mech_type})		MechType ::= OBJECT IDENTIFIER ({ksmbd_neg_token_init_mech_type})

	MechTypeList ::= SEQUENCE OF MechType		MechTypeList ::= SEQUENCE OF MechType

	@@ -17,19 +17,7 @@ NegTokenInit ::=
	reqFlags		reqFlags
	[1] BIT STRING OPTIONAL,		[1] BIT STRING OPTIONAL,
	mechToken		mechToken
	[2] OCTET STRING OPTIONAL ({neg_token_init_mech_token}),		[2] OCTET STRING OPTIONAL ({ksmbd_neg_token_init_mech_token}),
	mechListMIC
	[3] OCTET STRING OPTIONAL
	}

	NegTokenTarg ::=
	SEQUENCE {
	negResult
	[0] ENUMERATED OPTIONAL,
	supportedMech
	[1] OBJECT IDENTIFIER OPTIONAL,
	responseToken
	[2] OCTET STRING OPTIONAL ({neg_token_targ_resp_token}),
	mechListMIC		mechListMIC
	[3] OCTET STRING OPTIONAL		[3] OCTET STRING OPTIONAL
	}		}

fs/cifsd/spnego_negtokentarg.asn1→fs/cifsd/ksmbd_spnego_negtokentarg.asn1

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ NegTokenTarg ::=
	supportedMech		supportedMech
	[1] OBJECT IDENTIFIER OPTIONAL,		[1] OBJECT IDENTIFIER OPTIONAL,
	responseToken		responseToken
	[2] OCTET STRING OPTIONAL ({neg_token_targ_resp_token}),		[2] OCTET STRING OPTIONAL ({ksmbd_neg_token_targ_resp_token}),
	mechListMIC		mechListMIC
	[3] OCTET STRING OPTIONAL		[3] OCTET STRING OPTIONAL
	}		}