Skip to content

Commit 53cd102

Browse files
bryamzxzkeithbusch
authored andcommitted
nvmet: fix pre-auth out-of-bounds heap read in Discovery Get Log Page
nvmet_execute_disc_get_log_page() validates only the dword alignment of the host-supplied Log Page Offset (lpo). The 64-bit offset is then added to a small kzalloc'd buffer that holds the discovery log page and the result is passed straight to nvmet_copy_to_sgl(), which memcpy()s data_len bytes out to the host with no source-side bound check: u64 offset = nvmet_get_log_page_offset(req->cmd); /* 64-bit host */ size_t data_len = nvmet_get_log_page_len(req->cmd); /* 32-bit host */ ... if (offset & 0x3) { ... } /* only check */ ... alloc_len = sizeof(*hdr) + entry_size * discovery_log_entries(req); buffer = kzalloc(alloc_len, GFP_KERNEL); ... status = nvmet_copy_to_sgl(req, 0, buffer + offset, data_len); The Discovery controller is unauthenticated -- nvmet_host_allowed() returns true unconditionally for the discovery subsystem -- so the call is reachable pre-authentication by any TCP/RDMA/FC peer that can reach the nvmet target. With a discovery log page of ~1 KiB, an attacker requesting up to 4 KiB starting at offset == alloc_len reads the next slab page out and gets its content returned over the fabric (an empirical run on a default nvmet-tcp loopback target leaked 81 canonical kernel pointers in one Get Log Page response). Pointing the offset at unmapped kernel memory faults the in-kernel memcpy and crashes (or panics, on panic_on_oops=1) the target host instead. The attacker-controlled source-side offset pattern "nvmet_copy_to_sgl(req, 0, buffer + ATTACKER_OFFSET, ...)" is unique to nvmet_execute_disc_get_log_page in the entire nvmet codebase: every other Get Log Page handler in admin-cmd.c either ignores lpo (and silently starts every response at offset 0) or tracks a local destination offset with a fixed source pointer. Validate the host-supplied offset against the log page size, cap the copy length to what is actually available, and zero-fill any remainder of the host transfer buffer. The zero-fill matches the existing short-response pattern in nvmet_execute_get_log_changed_ns() (admin-cmd.c) and prevents leaking transport SGL contents when the host asks for more bytes than the log page contains. Fixes: a07b497 ("nvmet: add a generic NVMe target") Cc: stable@vger.kernel.org Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Bryam Vargas <hexlabsecurity@proton.me> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent 88bac2c commit 53cd102

1 file changed

Lines changed: 22 additions & 1 deletion

File tree

drivers/nvme/target/discovery.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ static void nvmet_execute_disc_get_log_page(struct nvmet_req *req)
166166
u64 offset = nvmet_get_log_page_offset(req->cmd);
167167
size_t data_len = nvmet_get_log_page_len(req->cmd);
168168
size_t alloc_len;
169+
size_t copy_len;
169170
struct nvmet_subsys_link *p;
170171
struct nvmet_port *r;
171172
u32 numrec = 0;
@@ -242,7 +243,27 @@ static void nvmet_execute_disc_get_log_page(struct nvmet_req *req)
242243

243244
up_read(&nvmet_config_sem);
244245

245-
status = nvmet_copy_to_sgl(req, 0, buffer + offset, data_len);
246+
/*
247+
* Validate the host-supplied log page offset before copying out.
248+
* Without this check, the host controls a 64-bit byte offset into
249+
* a small kzalloc'd buffer: a value past the log page lets the
250+
* subsequent memcpy read adjacent kernel heap, and a value aimed
251+
* at unmapped kernel memory faults the in-kernel copy and crashes
252+
* the target host. The Discovery controller is unauthenticated,
253+
* so the bug is reachable from any reachable fabric peer.
254+
*/
255+
if (offset > alloc_len) {
256+
req->error_loc =
257+
offsetof(struct nvme_get_log_page_command, lpo);
258+
status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
259+
goto out_free_buffer;
260+
}
261+
262+
copy_len = min_t(size_t, data_len, alloc_len - offset);
263+
status = nvmet_copy_to_sgl(req, 0, buffer + offset, copy_len);
264+
if (!status && copy_len < data_len)
265+
status = nvmet_zero_sgl(req, copy_len, data_len - copy_len);
266+
out_free_buffer:
246267
kfree(buffer);
247268
out:
248269
nvmet_req_complete(req, status);

0 commit comments

Comments
 (0)