block: print symbolic error name instead of error code [ Upstream commit 25c1772a0493463408489b1fae65cf77fe46cac1 ] Utilize the %pe print specifier to get the symbolic error name as a string (i.e "-ENOMEM") in the log message instead of the error code to increase its readablility. This change was suggested in https://lore.kernel.org/all/92972476-0b1f-4d0a-9951-af3fc8bc6e65@suswa.mountain/ BUG=b/375589144 TEST=presubmit RELEASE_NOTE=Fixed CVE-2024-47705 in the Linux kernel. cos-patch: security-moderate Change-Id: I6256c1d57a717ca639a7d943fa2fd320730720e6 Signed-off-by: Christian Heusel <christian@heusel.eu> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Link: https://lore.kernel.org/r/20240111231521.1596838-1-christian@heusel.eu Signed-off-by: Jens Axboe <axboe@kernel.dk> Stable-dep-of: 26e197b7f924 ("block: fix potential invalid pointer dereference in blk_add_partition") Signed-off-by: Sasha Levin <sashal@kernel.org> Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/85160 Reviewed-by: Oleksandr Tymoshenko <ovt@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com> Reviewed-by: Arnav Kansal <rnv@google.com>
diff --git a/block/partitions/core.c b/block/partitions/core.c index 3927f42..b71c0c2 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c
@@ -581,8 +581,8 @@ static bool blk_add_partition(struct gendisk *disk, part = add_partition(disk, p, from, size, state->parts[p].flags, &state->parts[p].info); if (IS_ERR(part) && PTR_ERR(part) != -ENXIO) { - printk(KERN_ERR " %s: p%d could not be added: %ld\n", - disk->disk_name, p, -PTR_ERR(part)); + printk(KERN_ERR " %s: p%d could not be added: %pe\n", + disk->disk_name, p, part); return true; }