diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2020-12-07 13:30:46 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2020-12-14 06:51:07 -0500 |
| commit | c54e959b36cbdb0cb2f2805e3e945dd83476a5c7 (patch) | |
| tree | a53fb8af2f9706bfc9ad9ba845a6e6c647e5776f /net/sunrpc/xdr.c | |
| parent | NFSv4.1: use BITS_PER_LONG macro in nfs4session.h (diff) | |
| download | linux-dev-c54e959b36cbdb0cb2f2805e3e945dd83476a5c7.tar.xz linux-dev-c54e959b36cbdb0cb2f2805e3e945dd83476a5c7.zip | |
SUNRPC: _shift_data_left/right_pages should check the shift length
Exit early if the shift is zero.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'net/sunrpc/xdr.c')
| -rw-r--r-- | net/sunrpc/xdr.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index c852d199c789..5833329c132c 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -225,6 +225,9 @@ _shift_data_left_pages(struct page **pages, size_t pgto_base, BUG_ON(pgfrom_base <= pgto_base); + if (!len) + return; + pgto = pages + (pgto_base >> PAGE_SHIFT); pgfrom = pages + (pgfrom_base >> PAGE_SHIFT); @@ -307,6 +310,9 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base, BUG_ON(pgto_base <= pgfrom_base); + if (!len) + return; + pgto_base += len; pgfrom_base += len; @@ -405,6 +411,9 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) char *vto; size_t copy; + if (!len) + return; + pgto = pages + (pgbase >> PAGE_SHIFT); pgbase &= ~PAGE_MASK; @@ -449,6 +458,9 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len) char *vfrom; size_t copy; + if (!len) + return; + pgfrom = pages + (pgbase >> PAGE_SHIFT); pgbase &= ~PAGE_MASK; |