security/keys: Use iovec_import() instead of import_iovec().
Subsystems (6)
PATCH 6/9 security/keys: Use iovec_import() instead of import_iovec().
iovec_import() has a safer calling convention than import_iovec().
Signed-off-by David Laight <[email protected]>
--- security/keys/compat.c | 11 +++++------ security/keys/keyctl.c | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-)
security/keys/compat.c +5 -6
@@ -26,18 +26,17 @@ static long compat_keyctl_instantiate_key_iov( unsigned ioc, key_serial_t ringid) { -struct iovec iovstack[UIO_FASTIOV ], *iov = iovstack; +struct iovec_cache cache;struct iov_iter from; +struct iovec *iov;long ret;if (!_payload_iov) ioc =0 ; - ret =compat_import_iovec (WRITE , _payload_iov, ioc, -ARRAY_SIZE (iovstack), &iov, - &from); -if (ret <0 ) -return ret; + iov =compat_iovec_import (WRITE , _payload_iov, ioc, &cache, &from); +if (IS_ERR (iov)) +return PTR_ERR (iov); ret =keyctl_instantiate_key_common (id, &from, ringid);kfree (iov);
security/keys/keyctl.c +5 -5
@@ -1276,17 +1276,17 @@ long keyctl_instantiate_key_iov(key_serial_t id, unsigned ioc, key_serial_t ringid) { -struct iovec iovstack[UIO_FASTIOV ], *iov = iovstack; +struct iovec_cache cache;struct iov_iter from; +struct iovec *iov;long ret;if (!_payload_iov) ioc =0 ; - ret =import_iovec (WRITE , _payload_iov, ioc, -ARRAY_SIZE (iovstack), &iov, &from); -if (ret <0 ) -return ret; + iov =iovec_import (WRITE , _payload_iov, ioc, &cache, &from); +if (IS_ERR (iov)) +return PTR_ERR (iov); ret =keyctl_instantiate_key_common (id, &from, ringid);kfree (iov);return ret;
Signature · 5 lines
2.25.1 - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)