Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45428a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.21' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "Thanks to Vasily Averin for fixing a use-after-free in the
  containerized NFSv4.2 client, and cleaning up some convoluted
  backchannel server code in the process.

  Otherwise, miscellaneous smaller bugfixes and cleanup"

* tag 'nfsd-4.21' of git://linux-nfs.org/~bfields/linux: (25 commits)
  nfs: fixed broken compilation in nfs_callback_up_net()
  nfs: minor typo in nfs4_callback_up_net()
  sunrpc: fix debug message in svc_create_xprt()
  sunrpc: make visible processing error in bc_svc_process()
  sunrpc: remove unused xpo_prep_reply_hdr callback
  sunrpc: remove svc_rdma_bc_class
  sunrpc: remove svc_tcp_bc_class
  sunrpc: remove unused bc_up operation from rpc_xprt_ops
  sunrpc: replace svc_serv->sv_bc_xprt by boolean flag
  sunrpc: use-after-free in svc_process_common()
  sunrpc: use SVC_NET() in svcauth_gss_* functions
  nfsd: drop useless LIST_HEAD
  lockd: Show pid of lockd for remote locks
  NFSD remove OP_CACHEME from 4.2 op_flags
  nfsd: Return EPERM, not EACCES, in some SETATTR cases
  sunrpc: fix cache_head leak due to queued request
  nfsd: clean up indentation, increase indentation in switch statement
  svcrdma: Optimize the logic that selects the R_key to invalidate
  nfsd: fix a warning in __cld_pipe_upcall()
  nfsd4: fix crash on writing v4_end_grace before nfsd startup
  ...
parents 85f78456 0ad30ff6

fs/lockd/clnt4xdr.c

+6 −16
Original line number Diff line number Diff line
@@ -128,24 +128,14 @@ static void encode_netobj(struct xdr_stream *xdr, 
static int decode_netobj(struct xdr_stream *xdr,

			 struct xdr_netobj *obj)

{

	u32 length;

	__be32 *p;

	ssize_t ret;



	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		goto out_overflow;

	length = be32_to_cpup(p++);

	if (unlikely(length > XDR_MAX_NETOBJ))

		goto out_size;

	obj->len = length;

	obj->data = (u8 *)p;

	return 0;

out_size:

	dprintk("NFS: returned netobj was too long: %u\n", length);

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	ret = xdr_stream_decode_opaque_inline(xdr, (void *)&obj->data,

						XDR_MAX_NETOBJ);

	if (unlikely(ret < 0))

		return -EIO;

	obj->len = ret;

	return 0;

}



/*

fs/lockd/clntproc.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl) 
			fl->fl_start = req->a_res.lock.fl.fl_start;

			fl->fl_end = req->a_res.lock.fl.fl_end;

			fl->fl_type = req->a_res.lock.fl.fl_type;

			fl->fl_pid = 0;

			fl->fl_pid = -req->a_res.lock.fl.fl_pid;

			break;

		default:

			status = nlm_stat_to_errno(req->a_res.status);

fs/lockd/clntxdr.c

+6 −16
Original line number Diff line number Diff line
@@ -125,24 +125,14 @@ static void encode_netobj(struct xdr_stream *xdr, 
static int decode_netobj(struct xdr_stream *xdr,

			 struct xdr_netobj *obj)

{

	u32 length;

	__be32 *p;

	ssize_t ret;



	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		goto out_overflow;

	length = be32_to_cpup(p++);

	if (unlikely(length > XDR_MAX_NETOBJ))

		goto out_size;

	obj->len = length;

	obj->data = (u8 *)p;

	return 0;

out_size:

	dprintk("NFS: returned netobj was too long: %u\n", length);

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	ret = xdr_stream_decode_opaque_inline(xdr, (void *)&obj->data,

			XDR_MAX_NETOBJ);

	if (unlikely(ret < 0))

		return -EIO;

	obj->len = ret;

	return 0;

}



/*

fs/lockd/xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ nlm_decode_lock(__be32 *p, struct nlm_lock *lock) 


	locks_init_lock(fl);

	fl->fl_owner = current->files;

	fl->fl_pid   = (pid_t)lock->svid;

	fl->fl_pid   = current->tgid;

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;		/* as good as anything else */

	start = ntohl(*p++);
@@ -269,7 +269,7 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
	memset(lock, 0, sizeof(*lock));

	locks_init_lock(&lock->fl);

	lock->svid = ~(u32) 0;

	lock->fl.fl_pid = (pid_t)lock->svid;

	lock->fl.fl_pid = current->tgid;



	if (!(p = nlm_decode_cookie(p, &argp->cookie))

	 || !(p = xdr_decode_string_inplace(p, &lock->caller,

fs/lockd/xdr4.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) 


	locks_init_lock(fl);

	fl->fl_owner = current->files;

	fl->fl_pid   = (pid_t)lock->svid;

	fl->fl_pid   = current->tgid;

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;		/* as good as anything else */

	p = xdr_decode_hyper(p, &start);
@@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
	memset(lock, 0, sizeof(*lock));

	locks_init_lock(&lock->fl);

	lock->svid = ~(u32) 0;

	lock->fl.fl_pid = (pid_t)lock->svid;

	lock->fl.fl_pid = current->tgid;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie))

	 || !(p = xdr_decode_string_inplace(p, &lock->caller,