Skip to content

Commit 9648e1d

Browse files
author
CKI KWF Bot
committed
Merge: CVE-2025-39903 kernel: of_numa: fix uninitialized memory nodes causing kernel panic
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1713 CVE: CVE-2025-39903 JIRA: https://issues.redhat.com/browse/RHEL-123153 Avoid kernel panic due to null pointer dereference Signed-off-by: Charles Mirabile <cmirabil@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents dbc0b90 + 9e4df9c commit 9648e1d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/of/of_numa.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,11 @@ static int __init of_numa_parse_memory_nodes(void)
6262
r = -EINVAL;
6363
}
6464

65-
for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++)
65+
for (i = 0; !r && !of_address_to_resource(np, i, &rsrc); i++) {
6666
r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
67+
if (!r)
68+
node_set(nid, numa_nodes_parsed);
69+
}
6770

6871
if (!i || r) {
6972
of_node_put(np);

0 commit comments

Comments
 (0)