nvme: sanitize metadata bounce buffer for reads
PATCH v2 1/1 nvme: sanitize metadata bounce buffer for reads
From: Keith Busch <[email protected]>
User can request more metadata bytes than the device will write. Ensure kernel buffer is initialized so we are not leaking unsanitized memory on the completion's copy-out.
---v1->v2:
correctly split data direction handling (axboe)
drivers/nvme/host/ioctl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/nvme/host/ioctl.c +7 -3
@@ -36,9 +36,13 @@ static void *nvme_add_user_metadata(struct request *req, void __user *ubuf,if (!buf) goto out; - ret = -EFAULT ; -if ((req_op (req) ==REQ_OP_DRV_OUT ) &©_from_user (buf, ubuf, len)) - goto out_free_meta; +if (req_op (req) ==REQ_OP_DRV_OUT ) { + ret = -EFAULT ; +if (copy_from_user (buf, ubuf, len)) + goto out_free_meta; + }else { +memset (buf,0 , len); + } bip =bio_integrity_alloc (bio,GFP_KERNEL ,1 );if (IS_ERR (bip)) {
Signature · 1 line
2.34.1
Quoted 27 lines · Keith Busch
From: Keith Busch <[email protected]>
User can request more metadata bytes than the device will write. Ensure kernel buffer is initialized so we are not leaking unsanitized memory on the completion's copy-out.
Fixes 0b7f1f26f95a51a ("nvme: use the block layer for userspace passthrough metadata")Signed-off-by Keith Busch <[email protected]>---
v1->v2:correctly split data direction handling (axboe)
drivers/nvme/host/ioctl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/nvme/host/ioctl.c +0
-3@@ -36,9 +36,13 @@ static void *nvme_add_user_metadata(struct request *req, void __user *ubuf,if (!buf) goto out; - ret = -EFAULT ; -if ((req_op (req) ==REQ_OP_DRV_OUT ) &©_from_user (buf, ubuf, len)) - goto out_free_meta;
drivers/nvme/host/ioctl.c static void *nvme_add_user_metadata(struct request *req, void __user *ubuf, · line 48
Quoted 10 lines
drivers/nvme/host/ioctl.c +7
-0+if (req_op (req) ==REQ_OP_DRV_OUT ) { + ret = -EFAULT ; +if (copy_from_user (buf, ubuf, len)) + goto out_free_meta; + }else { +memset (buf,0 , len); + } bip =bio_integrity_alloc (bio,GFP_KERNEL ,1 );if (IS_ERR (bip)) {
Signature · 1 line
Jens Axboe
Looks good:
Quoted 5 lines · Keith Busch
From: Keith Busch <[email protected]>
User can request more metadata bytes than the device will write. Ensure kernel buffer is initialized so we are not leaking unsanitized memory on the completion's copy-out.
Quoted 10 lines · Keith Busch
From: Keith Busch <[email protected]>
User can request more metadata bytes than the device will write. Ensure kernel buffer is initialized so we are not leaking unsanitized memory on the completion's copy-out.
Fixes 0b7f1f26f95a51a ("nvme: use the block layer for userspace passthrough metadata")Signed-off-by Keith Busch <[email protected]>---
V2 has a fix for comment posted on v1, looks good.
-ck