lockd: detect and reject lock arguments that overflow
Subsystems (2)
Jeff Layton
maintainerPATCH v2 1/1 lockd: detect and reject lock arguments that overflow
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.
--- fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)
v2: record args as u64s in nlm_lock and check them in
nlm4svc_retrieve_args
fs/lockd/svc4proc.c +8 -0
@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))
@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {
fs/lockd/xdr4.c +2 -17
@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64 loff_t_to_s64 (loff_t offset) {
@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;
@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }
include/linux/lockd/xdr.h +2 -0
@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; };
Signature · 1 line
2.37.1
Hi Jeff,
Can't speak to everything, but applying this patch on my system fixes the issues I was having.
Thanks for the quick patch!
Jan
Quoted 119 lines · Jeff Layton
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_locktracks the start and end asloff_tvalues. By the time we get around to callingnlm4svc_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. Innlm4svc_retrieve_args, vet these values to ensure they won't cause an overflow, and returnNLM4_FBIGif they do.Reported-by Jan Kasiak <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)v2: record args as u64s in
nlm_lockand check them in
nlm4svc_retrieve_argsfs/lockd/svc4proc.c +8
-0@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {fs/lockd/xdr4.c +2
-17@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64 loff_t_to_s64 (loff_t offset) {@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }include/linux/lockd/xdr.h +2
-1@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; }; --2.37.1
Quoted 14 lines · Jeff Layton
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_locktracks the start and end asloff_tvalues. By the time we get around to callingnlm4svc_retrieve_args, we've lost the information that would allow us to determine if there was an overflow.
Quoted 7 lines
Start tracking the actual start and len for NLM4 requests in the
nlm_lock. Innlm4svc_retrieve_args, vet these values to ensure they won't cause an overflow, and returnNLM4_FBIGif they do.Reported-by Jan Kasiak <[email protected]>Signed-off-by Jeff Layton <[email protected]>
I've applied this one to my private tree for testing. Thanks Jeff!
Quoted 101 lines
---
fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)v2: record args as u64s in
nlm_lockand check them in
nlm4svc_retrieve_argsfs/lockd/svc4proc.c +8
-0@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {fs/lockd/xdr4.c +0
-7@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64
loff_t_to_s64(loff_t offset)
{fs/lockd/xdr4.c +2
-10@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }include/linux/lockd/xdr.h +2
-0@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; };Signature · 1 line
2.37.1
--
Chuck Lever
Jeff Layton
maintainerQuoted 17 lines · Chuck Lever III
Quoted 17 lines · Jeff Layton
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_locktracks the start and end asloff_tvalues. By the time we get around to callingnlm4svc_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. Innlm4svc_retrieve_args, vet these values to ensure they won't cause an overflow, and returnNLM4_FBIGif they do.
Quoted 8 lines
Quoted 3 lines
Reported-by Jan Kasiak <[email protected]>Signed-off-by Jeff Layton <[email protected]>I've applied this one to my private tree for testing. Thanks Jeff!
Thank you. We should probably also consider sending this to stable kernels too. It's at least a DoS vector.
Quoted 107 lines
Quoted 101 lines
---
fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)v2: record args as u64s in
nlm_lockand check them in
nlm4svc_retrieve_argsfs/lockd/svc4proc.c +8
-0@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {fs/lockd/xdr4.c +0
-7@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64
loff_t_to_s64(loff_t offset)
{fs/lockd/xdr4.c +2
-10@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }include/linux/lockd/xdr.h +2
-0@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; };Signature · 1 line
2.37.1--
Chuck Lever
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 26 lines · Jeff Layton
Quoted 21 lines · Chuck Lever III
Quoted 20 lines · Jeff Layton
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_locktracks the start and end asloff_tvalues. By the time we get around to callingnlm4svc_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. Innlm4svc_retrieve_args, vet these values to ensure they won't cause an overflow, and returnNLM4_FBIGif they do.Reported-by Jan Kasiak <[email protected]>Signed-off-by Jeff Layton <[email protected]>
Quoted 7 lines
Quoted 4 lines
I've applied this one to my private tree for testing. Thanks Jeff!
Thank you. We should probably also consider sending this to stable kernels too. It's at least a DoS vector.
Agreed, though it won't apply before 345b4159a075 ("lockd: Update the NLMv4 TEST arguments decoder to use struct xdr_stream")
How about:
?
Quoted 98 lines
Quoted 98 lines
Quoted 98 lines
---
fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)v2: record args as u64s in
nlm_lockand check them in
nlm4svc_retrieve_argsfs/lockd/svc4proc.c +8
-0@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {fs/lockd/xdr4.c +0
-7@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64
loff_t_to_s64(loff_t offset)
{fs/lockd/xdr4.c +2
-10@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }include/linux/lockd/xdr.h +2
-0@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; };
Quoted 12 lines
Quoted 9 lines
Quoted 3 lines
Signature · 1 line
2.37.1--
Chuck LeverSignature · 1 line
Jeff Layton <[email protected]>
--
Chuck Lever
Jeff Layton
maintainerQuoted 33 lines · Chuck Lever III
Quoted 25 lines · Jeff Layton
Quoted 21 lines · Chuck Lever III
Quoted 20 lines · Jeff Layton
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_locktracks the start and end asloff_tvalues. By the time we get around to callingnlm4svc_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. Innlm4svc_retrieve_args, vet these values to ensure they won't cause an overflow, and returnNLM4_FBIGif they do.Reported-by Jan Kasiak <[email protected]>Signed-off-by Jeff Layton <[email protected]>Quoted 7 lines
Quoted 4 lines
I've applied this one to my private tree for testing. Thanks Jeff!
Thank you. We should probably also consider sending this to stable kernels too. It's at least a DoS vector.
Quoted 8 lines
Agreed, though it won't apply before
345b4159a075("lockd: Update the NLMv4 TEST arguments decoder to use structxdr_stream")How about:
Cc <[email protected]> # 5.14
Works for me. We could probably spin up a version for earlier kernels too if necessary.
Quoted 116 lines
Quoted 98 lines
Quoted 98 lines
Quoted 98 lines
---
fs/lockd/svc4proc.c | 8 ++++++++ fs/lockd/xdr4.c | 19 ++----------------- include/linux/lockd/xdr.h | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-)v2: record args as u64s in
nlm_lockand check them in
nlm4svc_retrieve_argsfs/lockd/svc4proc.c +8
-0@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,if (!nlmsvc_ops)return nlm_lck_denied_nolocks; +if (lock->lock_start >OFFSET_MAX || + (lock->lock_len && ((lock->lock_len -1 ) > (OFFSET_MAX - lock->lock_start)))) +return nlm4_fbig; +/* Obtain host handle */ if (!(host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len)) || (argp->monitor &&nsm_monitor (host) <0 ))@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Set up the missing parts of the file_lock structure */ lock->fl.fl_file = file->f_file[mode]; lock->fl.fl_pid = current->tgid; + lock->fl.fl_start = (loff_t )lock->lock_start; + lock->fl.fl_end = lock->lock_len ? + (loff_t)(lock->lock_start + lock->lock_len -1 ) : +OFFSET_MAX ; lock->fl.fl_lmops = &nlmsvc_lock_operations;nlmsvc_locks_init_private (&lock->fl, host, (pid_t )lock->svid);if (!lock->fl.fl_owner) {fs/lockd/xdr4.c +0
-7@@ -20,13 +20,6 @@#include "svcxdr.h" -static inline loff_t -s64_to_loff_t (__s64 offset) -{ -return (loff_t )offset; -} - -static inline s64
loff_t_to_s64(loff_t offset)
{fs/lockd/xdr4.c +2
-10@@ -70,8 +63,6 @@ static bool svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) { struct file_lock *fl = &lock->fl; -u64 len, start; -s64 end;if (!svcxdr_decode_string (xdr, &lock->caller, &lock->len))return false;@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)return false;if (xdr_stream_decode_u32 (xdr, &lock->svid) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &start) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_start) <0 )return false; -if (xdr_stream_decode_u64 (xdr, &len) <0 ) +if (xdr_stream_decode_u64 (xdr, &lock->lock_len) <0 )return false;locks_init_lock (fl); fl->fl_flags =FL_POSIX ; fl->fl_type =F_RDLCK ; - end = start + len -1 ; - fl->fl_start =s64_to_loff_t (start); -if (len ==0 || end <0 ) - fl->fl_end =OFFSET_MAX ; -else - fl->fl_end =s64_to_loff_t (end);return true; }include/linux/lockd/xdr.h +2
-0@@ -41,6 +41,8 @@ struct nlm_lock {struct nfs_fh fh;struct xdr_netobj oh;u32 svid; +u64 lock_start; +u64 lock_len;struct file_lock fl; };Quoted 12 lines
Quoted 9 lines
Quoted 3 lines
Signature · 1 line
2.37.1--
Chuck LeverSignature · 1 line
Jeff Layton <[email protected]>--
Chuck Lever
Signature · 1 line
Jeff Layton <[email protected]>