diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-18 11:37:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-18 11:37:12 -0700 |
| commit | b04ae0f45168973edb658ac2385045ac13c5aca7 (patch) | |
| tree | bb9ceb83bfbae99fc6c4fa3b96503300c2d35760 /fs/smb/client/compress.c | |
| parent | 568570fdf2b941115f0b1cf8d539255a1c707d9e (diff) | |
| parent | 6aca91c416f626fc0c5146cc4450ea86b831f3dd (diff) | |
| download | linux-b04ae0f45168973edb658ac2385045ac13c5aca7.tar.gz linux-b04ae0f45168973edb658ac2385045ac13c5aca7.tar.bz2 linux-b04ae0f45168973edb658ac2385045ac13c5aca7.zip | |
Merge tag 'v6.12-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fixes from Steve French:
- Fix possible double free setting xattrs
- Fix slab out of bounds with large ioctl payload
- Remove three unused functions, and an unused variable that could be
confusing
* tag 'v6.12-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Remove unused functions
smb/client: Fix logically dead code
smb: client: fix OOBs when building SMB2_IOCTL request
smb: client: fix possible double free in smb2_set_ea()
Diffstat (limited to 'fs/smb/client/compress.c')
| -rw-r--r-- | fs/smb/client/compress.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/smb/client/compress.c b/fs/smb/client/compress.c index 63b5a55b7a57..766b4de13da7 100644 --- a/fs/smb/client/compress.c +++ b/fs/smb/client/compress.c @@ -166,7 +166,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) loff_t start = iter->xarray_start + iter->iov_offset; pgoff_t last, index = start / PAGE_SIZE; size_t len, off, foff; - ssize_t ret = 0; void *p; int s = 0; @@ -193,9 +192,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) memcpy(&sample[s], p, len2); kunmap_local(p); - if (ret < 0) - return ret; - s += len2; if (len2 < SZ_2K || s >= max - SZ_2K) |