Skip to content

Commit 22cf4fa

Browse files
stephan-ghandersson
authored andcommitted
soc: qcom: socinfo: Avoid out of bounds read of serial number
On MSM8916 devices, the serial number exposed in sysfs is constant and does not change across individual devices. It's always: db410c:/sys/devices/soc0$ cat serial_number 2644893864 The firmware used on MSM8916 exposes SOCINFO_VERSION(0, 8), which does not have support for the serial_num field in the socinfo struct. There is an existing check to avoid exposing the serial number in that case, but it's not correct: When checking the item_size returned by SMEM, we need to make sure the *end* of the serial_num is within bounds, instead of comparing with the *start* offset. The serial_number currently exposed on MSM8916 devices is just an out of bounds read of whatever comes after the socinfo struct in SMEM. Fix this by changing offsetof() to offsetofend(), so that the size of the field is also taken into account. Cc: [email protected] Fixes: efb448d ("soc: qcom: Add socinfo driver") Signed-off-by: Stephan Gerhold <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent f900709 commit 22cf4fa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/soc/qcom/socinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static int qcom_socinfo_probe(struct platform_device *pdev)
796796
if (!qs->attr.soc_id || !qs->attr.revision)
797797
return -ENOMEM;
798798

799-
if (offsetof(struct socinfo, serial_num) <= item_size) {
799+
if (offsetofend(struct socinfo, serial_num) <= item_size) {
800800
qs->attr.serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL,
801801
"%u",
802802
le32_to_cpu(info->serial_num));

0 commit comments

Comments
 (0)