On Tue, Mar 21, 2023 at 12:46:28PM +0200, Amir Goldstein wrote:
> From: Jeff Layton <jlayton@xxxxxxxxxx>
>
> commit 7ff84910c66c9144cc0de9d9deed9fb84c03aff0 upstream.
>
> 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 <amir73il@xxxxxxxxx>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> Tested-by: Amir Goldstein <amir73il@xxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx #6.0
> Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
> ---
>
> Greg,
>
> The upstream fix applies cleanly to 6.1.y and 6.2.y, so as the
> Cc stable mentions, please apply upstream fix to those trees.
>
> Alas, the regressing commit was also applied to v5.15.61,
> so please apply this backport to fix 5.15.y.
Now queued up, thanks.
greg k-h
