summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-01-08 22:43:04 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2024-01-08 22:43:04 +0300
commit5db8752c3b81bd33a549f6f812bab81e3bb61b20 (patch)
treed97ebf3a57a5ef1c3d823d778627263f0903b27a /security
parent26458409a9b180ea6cc2cd7b67d6138984184669 (diff)
parent9fd7874c0e5c89d7da0b4442271696ec0f8edcba (diff)
downloadlinux-5db8752c3b81bd33a549f6f812bab81e3bb61b20.tar.xz
Merge tag 'vfs-6.8.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull vfs iov_iter cleanups from Christian Brauner: "This contains a minor cleanup. The patches drop an unused argument from import_single_range() allowing to replace import_single_range() with import_ubuf() and dropping import_single_range() completely" * tag 'vfs-6.8.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: iov_iter: replace import_single_range() with import_ubuf() iov_iter: remove unused 'iov' argument from import_single_range()
Diffstat (limited to 'security')
-rw-r--r--security/keys/keyctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 19be69fa4d05..10ba439968f7 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1252,12 +1252,11 @@ long keyctl_instantiate_key(key_serial_t id,
key_serial_t ringid)
{
if (_payload && plen) {
- struct iovec iov;
struct iov_iter from;
int ret;
- ret = import_single_range(ITER_SOURCE, (void __user *)_payload, plen,
- &iov, &from);
+ ret = import_ubuf(ITER_SOURCE, (void __user *)_payload, plen,
+ &from);
if (unlikely(ret))
return ret;