diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
| commit | 770493524e9f623826765eb97c64d699f4752e4f (patch) | |
| tree | 304c718009aa32834511d45497adb8acba496088 /lib/iov_iter.c | |
| parent | e4f7cc8c36e7cab391683db682402ab2f185bf92 (diff) | |
| parent | fe0fb58325e519008e2606a5aa2cff7ad23e212d (diff) | |
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
Diffstat (limited to 'lib/iov_iter.c')
| -rw-r--r-- | lib/iov_iter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 9ec806f989f2..65f550cb5081 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1428,6 +1428,8 @@ static ssize_t __import_iovec_ubuf(int type, const struct iovec __user *uvec, struct iovec *iov = *iovp; ssize_t ret; + *iovp = NULL; + if (compat) ret = copy_compat_iovec_from_user(iov, uvec, 1); else @@ -1438,7 +1440,6 @@ static ssize_t __import_iovec_ubuf(int type, const struct iovec __user *uvec, ret = import_ubuf(type, iov->iov_base, iov->iov_len, i); if (unlikely(ret)) return ret; - *iovp = NULL; return i->count; } |