summaryrefslogtreecommitdiff
path: root/security/keys
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-12-04 10:47:50 -0700
committerChristian Brauner <brauner@kernel.org>2023-12-05 11:57:37 +0100
commit9fd7874c0e5c89d7da0b4442271696ec0f8edcba (patch)
tree02f05ac2574b38dcc3b39a942c34c0d4b04c29f7 /security/keys
parent6ac805d13870925c787a28e3fe5cc73610cacd03 (diff)
iov_iter: replace import_single_range() with import_ubuf()
With the removal of the 'iov' argument to import_single_range(), the two functions are now fully identical. Convert the import_single_range() callers to import_ubuf(), and remove the former fully. Signed-off-by: Jens Axboe <axboe@kernel.dk> Link: https://lore.kernel.org/r/20231204174827.1258875-3-axboe@kernel.dk Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/keyctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 193df7ca3ca8..10ba439968f7 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1255,8 +1255,8 @@ long keyctl_instantiate_key(key_serial_t id,
struct iov_iter from;
int ret;
- ret = import_single_range(ITER_SOURCE, (void __user *)_payload, plen,
- &from);
+ ret = import_ubuf(ITER_SOURCE, (void __user *)_payload, plen,
+ &from);
if (unlikely(ret))
return ret;