Commit 959d921f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'labeled-nfs' into linux-next 

* labeled-nfs:
  NFS: Apply v4.1 capabilities to v4.2
  NFS: Add in v4.2 callback operation
  NFS: Make callbacks minor version generic
  Kconfig: Add Kconfig entry for Labeled NFS V4 client
  NFS: Extend NFS xattr handlers to accept the security namespace
  NFS: Client implementation of Labeled-NFS
  NFS: Add label lifecycle management
  NFS:Add labels to client function prototypes
  NFSv4: Extend fattr bitmaps to support all 3 words
  NFSv4: Introduce new label structure
  NFSv4: Add label recommended attribute and NFSv4 flags
  NFSv4.2: Added NFS v4.2 support to the NFS client
  SELinux: Add new labeling type native labels
  LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount data.
  Security: Add Hook to test if the particular xattr is part of a MAC model.
  Security: Add hook to calculate context based on a negative dentry.
  NFS: Add NFSv4.2 protocol constants

Conflicts:
	fs/nfs/nfs4proc.c
parents f112bb48 7017310a

fs/nfs/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -104,6 +104,15 @@ config NFS_V4_1 


	  If unsure, say N.



config NFS_V4_2

	bool "NFS client support for NFSv4.2"

	depends on NFS_V4_1

	help

	  This option enables support for minor version 2 of the NFSv4 protocol

	  in the kernel's NFS client.



	  If unsure, say N.



config PNFS_FILE_LAYOUT

	tristate

	depends on NFS_V4_1
@@ -131,6 +140,11 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN 
	  If the NFS client is unchanged from the upstream kernel, this

	  option should be set to the default "kernel.org".



config NFS_V4_SECURITY_LABEL

	bool

	depends on NFS_V4_2 && SECURITY

	default y



config ROOT_NFS

	bool "Root file system on NFS"

	depends on NFS_FS=y && IP_PNP

fs/nfs/callback.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n 
			ret = nfs4_callback_up_net(serv, net);

			break;

		case 1:

		case 2:

			ret = nfs41_callback_up_net(serv, net);

			break;

		default:

fs/nfs/callback.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ enum nfs4_callback_opnum { 
	OP_CB_WANTS_CANCELLED = 12,

	OP_CB_NOTIFY_LOCK   = 13,

	OP_CB_NOTIFY_DEVICEID = 14,

/* Callback operations new to NFSv4.2 */

	OP_CB_OFFLOAD = 15,

	OP_CB_ILLEGAL = 10044,

};
@@ -39,6 +41,7 @@ struct cb_process_state { 
	__be32			drc_status;

	struct nfs_client	*clp;

	u32			slotid;

	u32			minorversion;

	struct net		*net;

};

fs/nfs/callback_proc.c

+2 −1
Original line number Diff line number Diff line
@@ -406,7 +406,8 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
	int i;

	__be32 status = htonl(NFS4ERR_BADSESSION);



	clp = nfs4_find_client_sessionid(cps->net, args->csa_addr, &args->csa_sessionid);

	clp = nfs4_find_client_sessionid(cps->net, args->csa_addr,

					 &args->csa_sessionid, cps->minorversion);

	if (clp == NULL)

		goto out;

fs/nfs/callback_xdr.c

+42 −10
Original line number Diff line number Diff line
@@ -166,9 +166,9 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	hdr->minorversion = ntohl(*p++);

	/* Check minor version is zero or one. */

	if (hdr->minorversion <= 1) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 */

	/* Check for minor version support */

	if (hdr->minorversion <= NFS4_MAX_MINOR_VERSION) {

		hdr->cb_ident = ntohl(*p++); /* ignored by v4.1 and v4.2 */

	} else {

		pr_warn_ratelimited("NFS: %s: NFSv4 server callback with "

			"illegal minor version %u!\n",
@@ -786,6 +786,26 @@ static void nfs4_cb_free_slot(struct cb_process_state *cps) 
}

#endif /* CONFIG_NFS_V4_1 */



#ifdef CONFIG_NFS_V4_2

static __be32

preprocess_nfs42_op(int nop, unsigned int op_nr, struct callback_op **op)

{

	__be32 status = preprocess_nfs41_op(nop, op_nr, op);

	if (status != htonl(NFS4ERR_OP_ILLEGAL))

		return status;



	if (op_nr == OP_CB_OFFLOAD)

		return htonl(NFS4ERR_NOTSUPP);

	return htonl(NFS4ERR_OP_ILLEGAL);

}

#else /* CONFIG_NFS_V4_2 */

static __be32

preprocess_nfs42_op(int nop, unsigned int op_nr, struct callback_op **op)

{

	return htonl(NFS4ERR_MINOR_VERS_MISMATCH);

}

#endif /* CONFIG_NFS_V4_2 */



static __be32

preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op)

{
@@ -801,8 +821,7 @@ preprocess_nfs4_op(unsigned int op_nr, struct callback_op **op) 
	return htonl(NFS_OK);

}



static __be32 process_op(uint32_t minorversion, int nop,

		struct svc_rqst *rqstp,

static __be32 process_op(int nop, struct svc_rqst *rqstp,

		struct xdr_stream *xdr_in, void *argp,

		struct xdr_stream *xdr_out, void *resp,

		struct cb_process_state *cps)
@@ -819,10 +838,22 @@ static __be32 process_op(uint32_t minorversion, int nop, 
		return status;



	dprintk("%s: minorversion=%d nop=%d op_nr=%u\n",

		__func__, minorversion, nop, op_nr);

		__func__, cps->minorversion, nop, op_nr);



	switch (cps->minorversion) {

	case 0:

		status = preprocess_nfs4_op(op_nr, &op);

		break;

	case 1:

		status = preprocess_nfs41_op(nop, op_nr, &op);

		break;

	case 2:

		status = preprocess_nfs42_op(nop, op_nr, &op);

		break;

	default:

		status = htonl(NFS4ERR_MINOR_VERS_MISMATCH);

	}



	status = minorversion ? preprocess_nfs41_op(nop, op_nr, &op) :

				preprocess_nfs4_op(op_nr, &op);

	if (status == htonl(NFS4ERR_OP_ILLEGAL))

		op_nr = OP_CB_ILLEGAL;

	if (status)
@@ -885,14 +916,15 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
			return rpc_drop_reply;

	}



	cps.minorversion = hdr_arg.minorversion;

	hdr_res.taglen = hdr_arg.taglen;

	hdr_res.tag = hdr_arg.tag;

	if (encode_compound_hdr_res(&xdr_out, &hdr_res) != 0)

		return rpc_system_err;



	while (status == 0 && nops != hdr_arg.nops) {

		status = process_op(hdr_arg.minorversion, nops, rqstp,

				    &xdr_in, argp, &xdr_out, resp, &cps);

		status = process_op(nops, rqstp, &xdr_in,

				    argp, &xdr_out, resp, &cps);

		nops++;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE