linux-toradex.git/fs/lockd/xdr4.c, branch v6.4-rc6

lockd: set file_lock start and end when decoding nlm4 testargs

2023-03-14T18:00:55+00:00

Commit 6930bcbfb6ce dropped the setting of the file_lock range when
decoding a nlm_lock off the wire. This causes the client side grant
callback to miss matching blocks and reject the lock, only to rerequest
it 30s later.

Add a helper function to set the file_lock range from the start and end
values that the protocol uses, and have the nlm_lock decoder call that to
set up the file_lock args properly.

Fixes: 6930bcbfb6ce ("lockd: detect and reject lock arguments that overflow")
Reported-by: Amir Goldstein 
Signed-off-by: Jeff Layton 
Tested-by: Amir Goldstein 
Cc: stable@vger.kernel.org #6.0
Signed-off-by: Anna Schumaker

lockd: detect and reject lock arguments that overflow

2022-08-04T14:28:48+00:00

lockd doesn't currently vet the start and length in nlm4 requests like
it should, and can end up generating lock requests with arguments that
overflow when passed to the filesystem.

The NLM4 protocol uses unsigned 64-bit arguments for both start and
length, whereas struct file_lock tracks the start and end as loff_t
values. By the time we get around to calling nlm4svc_retrieve_args,
we've lost the information that would allow us to determine if there was
an overflow.

Start tracking the actual start and len for NLM4 requests in the
nlm_lock. In nlm4svc_retrieve_args, vet these values to ensure they
won't cause an overflow, and return NLM4_FBIG if they do.

Link: https://bugzilla.linux-nfs.org/show_bug.cgi?id=392
Reported-by: Jan Kasiak 
Signed-off-by: Jeff Layton 
Signed-off-by: Chuck Lever 
Cc:  # 5.14+

SUNRPC: Change return value type of .pc_encode

2021-10-13T15:34:49+00:00

Returning an undecorated integer is an age-old trope, but it's
not clear (even to previous experts in this code) that the only
valid return values are 1 and 0. These functions do not return
a negative errno, rpc_stat value, or a positive length.

Document there are only two valid return values by having
.pc_encode return only true or false.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

SUNRPC: Replace the "__be32 *p" parameter to .pc_encode

2021-10-13T15:34:49+00:00

The passed-in value of the "__be32 *p" parameter is now unused in
every server-side XDR encoder, and can be removed.

Note also that there is a line in each encoder that sets up a local
pointer to a struct xdr_stream. Passing that pointer from the
dispatcher instead saves one line per encoder function.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

SUNRPC: Change return value type of .pc_decode

2021-10-13T14:29:41+00:00

Returning an undecorated integer is an age-old trope, but it's
not clear (even to previous experts in this code) that the only
valid return values are 1 and 0. These functions do not return
a negative errno, rpc_stat value, or a positive length.

Document there are only two valid return values by having
.pc_decode return only true or false.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

SUNRPC: Replace the "__be32 *p" parameter to .pc_decode

2021-10-13T14:29:41+00:00

The passed-in value of the "__be32 *p" parameter is now unused in
every server-side XDR decoder, and can be removed.

Note also that there is a line in each decoder that sets up a local
pointer to a struct xdr_stream. Passing that pointer from the
dispatcher instead saves one line per decoder function.

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

lockd: Update the NLMv4 SHARE results encoder to use struct xdr_stream

2021-07-07T00:14:44+00:00

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

lockd: Update the NLMv4 nlm_res results encoder to use struct xdr_stream

2021-07-07T00:14:44+00:00

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

lockd: Update the NLMv4 TEST results encoder to use struct xdr_stream

2021-07-07T00:14:44+00:00

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields

lockd: Update the NLMv4 void results encoder to use struct xdr_stream

2021-07-07T00:14:44+00:00

Signed-off-by: Chuck Lever 
Signed-off-by: J. Bruce Fields