diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-03 13:02:29 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-03 13:02:29 +0100 |
commit | e681a9d2050cdcaf24adeabc9f1aea6cff94be22 (patch) | |
tree | 5dccb613fdadb3f792bfedc0c224581d1b3e7a73 /fs/ksmbd/ndr.c | |
parent | usb: dwc2: Simplify a bitmap declaration (diff) | |
parent | Linux 5.16-rc8 (diff) | |
download | linux-e681a9d2050cdcaf24adeabc9f1aea6cff94be22.tar.xz linux-e681a9d2050cdcaf24adeabc9f1aea6cff94be22.zip |
Merge 5.16-rc8 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ksmbd/ndr.c')
-rw-r--r-- | fs/ksmbd/ndr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ksmbd/ndr.c b/fs/ksmbd/ndr.c index 8317f7ca402b..5052be9261d9 100644 --- a/fs/ksmbd/ndr.c +++ b/fs/ksmbd/ndr.c @@ -148,7 +148,7 @@ static int ndr_read_int16(struct ndr *n, __u16 *value) static int ndr_read_int32(struct ndr *n, __u32 *value) { if (n->offset + sizeof(__u32) > n->length) - return 0; + return -EINVAL; if (value) *value = le32_to_cpu(*(__le32 *)ndr_get_field(n)); |