From patchwork Thu Feb 22 22:23:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 205087 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp250494dyb; Thu, 22 Feb 2024 14:24:01 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUsFdXGD9Uf8Y0R+3B+fjr3wRiCo3jYSKU+SP/2c5NQXpRLtiCoGtUOx27iKPZ/pf7lzf3A6lHYHXfX3O40YHJqZ1XSNQ== X-Google-Smtp-Source: AGHT+IGo/yDgHuRGwTFNdU2sZlsplbldQSyp2spv1+MyLkju8QubyKzdM8xZkaFCSPM0tH8Lg5Ep X-Received: by 2002:a05:6830:22db:b0:6e2:decb:2462 with SMTP id q27-20020a05683022db00b006e2decb2462mr426069otc.0.1708640641616; Thu, 22 Feb 2024 14:24:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708640641; cv=pass; d=google.com; s=arc-20160816; b=sV2d3Epj3BbSmM1cShywIP2zEfaWtvlBFw4TBcY0rvOipRJ8lEIXdaQb4015aThf1+ liYdXbbl3ws58kDAGN/j1na98+4qhC+d1evVAGL2tMibgOXRCFfsQgLJa+p6wZhz1JTS Qm+NZp9j8KWjFNJ43pPrn9zs/x0w1qHRW5R2us3Hk9JhBrxXl1JOwyLxZ3a+31yMf/6b tq+McrgmReO8uBSp5jN6UMxaA7GsctW8l+ePOPd+fNZ/sGst90RlXYmK9PXT6wOFRb5G ANUAgAbdyoI9fktYQ1rmkKat1FMyA4egtlDpdpEjmj+hoLanUbxzf28C1AdIKJzMae3e Khxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=Q+5ilM19CFuUy0zgxwZQpQ+MBc9LAqwOhihVDIFuqNw=; fh=NluW+A8WEk1VlTsrdVz4x4jbk2Xf0yFe6BHvuJzyvII=; b=HqKrKaQL02VJK1hMc1U5wVw5DlBg8N28U1Jm3rYAtyICrfIQyq0rPT/9RzbwGgT/HI FjM0p2eFh0/0PkmdOQtwmAZv0pOtoGHNAi/LzZMVjwEosy1mBM+59V5xrzdbst8FUb3a IQN593drgN79OE3y4N74DSTZ8/TmIEgn0hwcrF1uzmW4+jZuFTUgjnvvflqY0tFtQ2bS w512UXGoLQAuZ0xDxzUN/V7TlESl25WQx9PQiRu8p6Is1nGcIrN57Ltw3Z5XUrs99wyH XFEjUBeWn3FxO6w4F9NgrDpAdOgRXAi/ZJ6NyXbaANh3fyNSuLWKdcMdtnY8KOBMlS/j xXnw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Wk8sM5Jr; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-77461-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77461-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id q23-20020ac84517000000b0042c3e04578bsi12691115qtn.688.2024.02.22.14.24.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:24:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-77461-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Wk8sM5Jr; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-77461-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77461-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 549F81C2156B for ; Thu, 22 Feb 2024 22:24:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 80671137923; Thu, 22 Feb 2024 22:23:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Wk8sM5Jr" Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 2B0D712D21C for ; Thu, 22 Feb 2024 22:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708640624; cv=none; b=gZn4D8VtH4NYaxxepk0SXqb0n89oQxs48EgauisyheXryB4qGBPNilAeqALDJuKpcY3a70P2n/Q2CfNNtouIuhPoMXfMAJR24ZRIQfsYnIC8VDskSfIwM65VHUBagD2Bgwdb93jOp2Jndqit2VAhFCetgQKGekFfsie1lMa6v2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708640624; c=relaxed/simple; bh=0xRi+wRovLEtle3IAhjBAqJ3i0Q5IwxvEzplbN5MjGY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=juEkYIIj1miDq+ioDgo3Rd2olAlMiY60BIIfnAVRA7ctkZmHkW66ALQapY8TYHw80DDsaDQZet3sooFpPdUMAdT01L/IfDlwYOH9wDA9ZvKK5OTt9JF7X9Jd2ttuvKacgDRGHUXBcmG25cMH1sAcXztErwbNAK2pwNvIe0Yo9sQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Wk8sM5Jr; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1dc0e5b223eso1285045ad.1 for ; Thu, 22 Feb 2024 14:23:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708640622; x=1709245422; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q+5ilM19CFuUy0zgxwZQpQ+MBc9LAqwOhihVDIFuqNw=; b=Wk8sM5Jr5RVyv1CJ8e2xQ7BJ05jg8DtIk2sQRodjsmsowBM38MTt9Ik6ECevL8beVg CxDVqSaPBAl0NpcyJI092dcwpNPngExtl8mRPRMIv+wCZ6leaMpld2aW1BD2rUi2KQpu LuBWqlxFSzqTpjHIUZ+R6pNOHGE8H6M/i6id8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708640622; x=1709245422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Q+5ilM19CFuUy0zgxwZQpQ+MBc9LAqwOhihVDIFuqNw=; b=naL/Dx/WOJkifwyejwVfB5EMSJSslj/PMb6AW4d6Gy6yD8s/GwFvIdiL7WpYAlw1Sg ma1Ba/o9TwYo5l9f/1wF7RkXGV9Hl2WNSjxbH/6NqlvQmGmF6QpQPdUw7btTadziEE4x 2AV707bWqx+IMVQytsrY7FVcqKLe26Q7g9dNyAS62/sfUtNopkJNpXJJf6rJ3kBpNbrG eo6YOP7sqj0aohAAEdF7rpI19pU9mqwkAAHfwgPRQQDOoglUROTftbh1CZgtH8XvWBVq Yh1+pMSeEjueormC0bsY/5yRyX0YBsP/btnfvpQIS2OweE1vdDUiDYWUj3R4F5pASpUq Noww== X-Forwarded-Encrypted: i=1; AJvYcCVI4+K9s73kn6gi6TdSuso4AqSxXwgh/cZ8zdkz1C40ejQ2zuXzbI3I4SZ/DPiUYg1o/Q1WcZgGAC6+OXG/P9IwA7C7ntZwq4DlXSQG X-Gm-Message-State: AOJu0YzIJLWv3jv6oPvXikD/Mgv/vD0i+BI1fJIfWhu72MMksxo5yBL+ Z89y2UTMGu7TDjqLhUr7JHL/IuICgl2nwXUy/iTmUMP3IxwS4BdIks+G2LzuBg== X-Received: by 2002:a17:902:e5cb:b0:1db:d13e:26fb with SMTP id u11-20020a170902e5cb00b001dbd13e26fbmr266381plf.5.1708640622569; Thu, 22 Feb 2024 14:23:42 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id g12-20020a170902c98c00b001d8aadaa7easm10458002plc.96.2024.02.22.14.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:23:41 -0800 (PST) From: Kees Cook To: Jonathan Cameron Cc: Kees Cook , Lars-Peter Clausen , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Andy Shevchenko , =?utf-8?q?Nuno_S=C3=A1?= , linux-iio@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] [RFC] iio: pressure: dlhl60d: Check mask_width for IRQs Date: Thu, 22 Feb 2024 14:23:39 -0800 Message-Id: <20240222222335.work.759-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1986; i=keescook@chromium.org; h=from:subject:message-id; bh=0xRi+wRovLEtle3IAhjBAqJ3i0Q5IwxvEzplbN5MjGY=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl18lq4o+31/1R0DWW8xWF6Y+7BP30IH/M1esol O1U6dy83cuJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZdfJagAKCRCJcvTf3G3A JtaRD/9phV+1oaxweCDWM7RyA5yYZNO0eEqTdKf4RB6phXBkx9kEI7rGUVfbyrXtZ0NC+Nx1rNv YPwLgODU6hZ6heWm1tX+r26uJ4XR7UM/wqORisZmp8e9X4iicnJtPPF9BpC8YsWfbDf5EFw09ip N+4mhNwKHfW6hvAG4l0ujSvKtJnIGTaKy8JowAz0VRswGgw/xGbQatKmvPuABoOxt3HMXXBP3Qm gSzJQ09JSv2A74EpZAcRKvX1qg8a3bAdPrHyQFHmZNt1sqW54K2KWU+w2umluFntRwtv9AfItiv 81zNznm5WHoKMz83Y8VyHE5bBcUpRp06+1+KfnAZ6JdexzUsQ3Sw7t1rqTfUsRLjreMaplHPbf1 Xbv4YatUXU3FeQ0kuvAH3z66vmuGvG9j4GvjxjvJ1tgJ/aFAD6gsayqP1j07Op5om1MCgspydfv ATbWJR60pbqyr37CFhZ7LDB3ko/cKUq+FBUFl8Ot4iN0ffVMOtLLHNTY0Os0A/L2ZyM9MLilnLF 4M5PfHPjKrAeU869+gMxnFWfA/vTdZ3ti4rVtvLwYPzpCbTxcRmOTNY7zo9bA8HEUqHelVjo0Bv f0RfC+TisOs7I5itK9ke182+3YIAUbVYWtkOFQluiu5dsJCzihtVr6/0MVdORj1rVJ+Jq4pW1CP x2bqQQk KFcoGfpA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791639569680169238 X-GMAIL-MSGID: 1791639569680169238 Clang tripped over a FORTIFY warning in this code, and while it seems it may be a false positive in Clang due to loop unwinding, the code in question seems to make a lot of assumptions. Comments added, and the Clang warning[1] has been worked around by growing the array size. Also there was an uninitialized 4th byte in the __be32 array that was being sent through to iio_push_to_buffers(). Link: https://github.com/ClangBuiltLinux/linux/issues/2000 [1] Signed-off-by: Kees Cook --- Cc: Jonathan Cameron Cc: Lars-Peter Clausen Cc: "Uwe Kleine-König" Cc: Andy Shevchenko Cc: "Nuno Sá" Cc: linux-iio@vger.kernel.org --- drivers/iio/pressure/dlhl60d.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/iio/pressure/dlhl60d.c b/drivers/iio/pressure/dlhl60d.c index 28c8269ba65d..9bbecd0bfe88 100644 --- a/drivers/iio/pressure/dlhl60d.c +++ b/drivers/iio/pressure/dlhl60d.c @@ -250,20 +250,27 @@ static irqreturn_t dlh_trigger_handler(int irq, void *private) struct dlh_state *st = iio_priv(indio_dev); int ret; unsigned int chn, i = 0; - __be32 tmp_buf[2]; + /* This was only an array pair of 4 bytes. */ + __be32 tmp_buf[4] = { }; ret = dlh_start_capture_and_read(st); if (ret) goto out; + /* Nothing was checking masklength vs ARRAY_SIZE(tmp_buf)? */ + if (WARN_ON_ONCE(indio_dev->masklength > ARRAY_SIZE(tmp_buf))) + goto out; + for_each_set_bit(chn, indio_dev->active_scan_mask, indio_dev->masklength) { - memcpy(tmp_buf + i, + /* This is copying 3 bytes. What about the 4th? */ + memcpy(&tmp_buf[i], &st->rx_buf[1] + chn * DLH_NUM_DATA_BYTES, DLH_NUM_DATA_BYTES); i++; } + /* How do we know the iio buffer_list has only 2 items? */ iio_push_to_buffers(indio_dev, tmp_buf); out: