From nobody Sun May 10 06:29:12 2026 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF73B199235 for ; Mon, 30 Dec 2024 19:59:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735588789; cv=none; b=poj+bRDISM1bnYb3HE7KntlU6dQhzOE4jLg9nrjQSF/46yuhLuGsySmgs6ucaj5TvvACUdPM7Ht2t9q1SnLrGD6IGYc/S42lXEKZDJqMgNsWDaiTiJmAolcrtnkI0R05kkKnujuxblwOBjr3ktWmTrNtqU4ZxOGhUl74PojEacY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735588789; c=relaxed/simple; bh=jqKk5T5lIBOI1QztQyZJ393y//Bdt9WcIiq6uelv/tE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=FYytSqRkvUtLDcP5ekqadcNytFl3AGwcsI4fOGnKWcAGwq1FEQhVIkfwk/4KXiRe6FQq83zvIU6GD5vlSsixOV0VYwwQthTu4fqO8z+NmydOs03pNkkO21owW0qMp5iYPpIJkLSlmkfTNWCxyGYWwnXCDioid6Nia1gTL9H6y2g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kmk9shUH; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kmk9shUH" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aaf6b1a5f2bso123802066b.1 for ; Mon, 30 Dec 2024 11:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1735588786; x=1736193586; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=p8ITBzWchsZ6aiNKydDGT+QBnZjk0ZvKoShykaX3QQc=; b=kmk9shUH/PGDJy+oz+booiJ579Dig8n/Zi8VGfaveAnMI3VUO94EEpw8cS+6vfQZRO ju8wtgNVCNTdVTokWWDHTUfpNfriwCKuvm872DLBldFdULqe84E5yaVcOYyXmLUoPT4d QCQWs0zq7+i0ETSIGpY8WDK/vwb4dMlpu0YwTWTMCA4SqkZWFuRHrc7w26i20GH8lQXl VkJVHMU9LpeawsI8G7EuQELV7/Qq44WubXZ4IxN/bbfwPWkmFsCPo8m1Bno617tDbz0F B0qdtleaMN2kRbRCsMCsidUzyF2jOK+mhWzXtsyjH5uySLvTVf46UP0xWtNEWnauhDSi I7TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735588786; x=1736193586; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p8ITBzWchsZ6aiNKydDGT+QBnZjk0ZvKoShykaX3QQc=; b=e6OpR6fOGHOAeDyJBVSxIpv1SkuMagxgzh/qBJA2U3okgTPciTyZlgGRUQbV30j15p GJJV6qAKTS5dkfQjhUnQEmq5gjZXib2+ruZ7is16FV63kbqtWSvPw2BQnQlzHYmhSxxx A4xKYk+V0vvXSHIwlMANYZkpK8Y4wOcgKy0k2bgKfClfQ0g/ocqUaBi+RIc0+05EXwgu KB+mrDSeo9qaR8IzX3DJayPezziWV+NbKCaDy9YeKoBsFkbr5K5rmOZUTRgP2FicVmKZ ZTMjj7V06xRKw9KeTBbXmUv9jpSGG7bJ2dKGjbRgOs/6uPoIoWRf5z896D6JQG5ISAV7 yFVA== X-Forwarded-Encrypted: i=1; AJvYcCV793Um3NCPpdCb3kAgVh3SRNQu0z4G5sKfpmIj7HnQuMoIxiiW/kYBhAKw0jBJgaP/9TZ+qr54812OHaU=@vger.kernel.org X-Gm-Message-State: AOJu0YzHt3SFa5wBpbU4XPLiSMcrGsnBCBr8KSK3nKonm+Y6/eAh6zeJ MoDcKbdR1WQpfHyooetepCWUMffvUb2ceTVWxIY9pEFHXz9ZgWmmEuP56MqSNn2lRN2vjs0DPW2 B X-Gm-Gg: ASbGncs3DCu5DTCuebUezTfo3IBSC9Q0ROZSk1N0VHPjyxgAuFMuiQfqtx6AOt05m7H wbCs1uikxXAvmPJ3KVncBXJHPDOf19LMS1RIpSUiuTl2s5BmrYDTM5iZaOV9r5tuWzoDa2g9mVv Hi6U+NZY2L0H1oKf5HTaf4saGQ1U00F61HYGSMljWv1jgwPohjmduKlg6wnVtIjBa417lQKcjFH W72twkw/BmDTJ8/19veoSxrtz3Ey8TA8N33tujWYtLor9q0rzaYBs16amiMPQ0N5w2V5Q== X-Google-Smtp-Source: AGHT+IEl73fx1iMH9phpTdGE5/7WHNBN41U0T7++LZh46oaIBWF/nu5kJDZmoD+HKv+QAOervaTSNg== X-Received: by 2002:a17:907:3f0f:b0:aa6:8b4a:4695 with SMTP id a640c23a62f3a-aac349d32eamr3129514166b.31.1735588785911; Mon, 30 Dec 2024 11:59:45 -0800 (PST) Received: from [127.0.0.2] ([2a02:2454:ff21:ef40:4241:5a6c:e13b:73f9]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aac0eae74e4sm1495200866b.91.2024.12.30.11.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 11:59:45 -0800 (PST) From: Stephan Gerhold Date: Mon, 30 Dec 2024 20:59:35 +0100 Subject: [PATCH] soc: qcom: socinfo: Avoid out of bounds read of serial number Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241230-qcom-socinfo-serialno-oob-v1-1-9b7a890da3da@linaro.org> X-B4-Tracking: v=1; b=H4sIAKb7cmcC/x3MQQqDMBBA0avIrB2IUyvaq4iLNE50QDM1ASkE7 97Y5V+8nyFxFE7wqjJEPiWJhhJNXYFbbVgYZS4NZKht6GHwcLpjUifBK97YbkFR9Y3PvvPG0jz QYKH4T2Qv3/97nK7rB0KX9FFrAAAA X-Change-ID: 20241230-qcom-socinfo-serialno-oob-586f0a2d929a To: Bjorn Andersson , Konrad Dybcio Cc: Vinod Koul , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 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: stable@vger.kernel.org Fixes: efb448d0a3fc ("soc: qcom: Add socinfo driver") Signed-off-by: Stephan Gerhold Reviewed-by: Dmitry Baryshkov --- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 62fadfe44a09f86ac641a4f6c162a1a1c185a985..d49c55979bb3080c724c6cffe27= f3a6ef29ff62b 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -796,7 +796,7 @@ static int qcom_socinfo_probe(struct platform_device *p= dev) if (!qs->attr.soc_id || !qs->attr.revision) return -ENOMEM; =20 - if (offsetof(struct socinfo, serial_num) <=3D item_size) { + if (offsetofend(struct socinfo, serial_num) <=3D item_size) { qs->attr.serial_number =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u", le32_to_cpu(info->serial_num)); --- base-commit: 643bc7bbfa59a89d46819949dfd0baf8fdb4c3ce change-id: 20241230-qcom-socinfo-serialno-oob-586f0a2d929a Best regards, --=20 Stephan Gerhold