Skip to content

Commit 5e77754

Browse files
committed
Merge: 2 CVE fixes
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7000 JIRA: https://issues.redhat.com/browse/RHEL-75893 CVE: CVE-2024-56662 JIRA: https://issues.redhat.com/browse/RHEL-74645 CVE: CVE-2025-21633 1 nvdimm fix, 1 io_uring fix. Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Ming Lei <ming.lei@redhat.com> Approved-by: Brian Foster <bfoster@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents dac06d7 + 46e3248 commit 5e77754

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

drivers/acpi/nfit/core.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,13 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
454454
if (cmd_rc)
455455
*cmd_rc = -EINVAL;
456456

457-
if (cmd == ND_CMD_CALL)
457+
if (cmd == ND_CMD_CALL) {
458+
if (!buf || buf_len < sizeof(*call_pkg))
459+
return -EINVAL;
460+
458461
call_pkg = buf;
462+
}
463+
459464
func = cmd_to_func(nfit_mem, cmd, call_pkg, &family);
460465
if (func < 0)
461466
return func;

io_uring/sqpoll.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,12 @@ static int io_sq_thread(void *data)
278278
DEFINE_WAIT(wait);
279279

280280
/* offload context creation failed, just exit */
281-
if (!current->io_uring)
281+
if (!current->io_uring) {
282+
mutex_lock(&sqd->lock);
283+
sqd->thread = NULL;
284+
mutex_unlock(&sqd->lock);
282285
goto err_out;
286+
}
283287

284288
snprintf(buf, sizeof(buf), "iou-sqp-%d", sqd->task_pid);
285289
set_task_comm(current, buf);

0 commit comments

Comments
 (0)