From patchwork Fri Sep 22 17:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143642 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5846152vqi; Fri, 22 Sep 2023 13:24:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjyeofIHDXuCp4HGBW6kB6J9cyhXUL9RGbXnqkW05Z+Wc8/gTw3h2RrYs9t23DB+2WJmOv X-Received: by 2002:a05:6808:14d4:b0:3ae:237a:1338 with SMTP id f20-20020a05680814d400b003ae237a1338mr944205oiw.1.1695414241073; Fri, 22 Sep 2023 13:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695414241; cv=none; d=google.com; s=arc-20160816; b=pGQl0GAsHwmC7X/zfvCugM465AmVVB2l+KOchw23EXd/TSj+14MqWfFfx6ZMlenNSY ClVl+8rcxUlR8q3A5WE0Rnp1KFq+I3krAdjmaUQKh3KSmwXjPO3QijfYOUm4PnNTLMxL NVai7JK1kowh82SvxMQgzoIaNnoUQLByLx+JqS/9ezzWZGmTdKS6madW5hrt8th/vAcP NF5zdjNiYHNyTd+QIs8NeYn5G6pihcvEyOpGyXU44Fl4SxNRcV58rKKLXozWC6n4I2Mh XTqGypM5pOCN3JXYTgedOelFI1pSYzQLrrdExHsjLCZ84QEVLPHExf1TDtHzMars9haH 3XyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=jdTn/0muvJtiHpvCIE7e0tTaPM/Ce4Zkoiyha7khL+I=; fh=hODxHTJrbb9t6CqiZ3Xv6futK6RGdLrPmBju7AzR7jM=; b=bBQtS+D9PnVcxOacu8jfy8C6sCaR52Y+fQKry1wXU5Y9Kg6Xl5QL7pGbMGwObObmJ6 pxTNdpvKJO1qD8UaIKV31UDybVpHolk2B5MQkTH3V6GKmS1T7L9sqnP9G8BItZUHdyLj jfPrGBjIDRPS9qW3DI8wSDNhNDBYVEQazHSCbjfCXuxVqg//X9Z7+iQycmSzR1KqBqrD hs5pSGHOgf8BJgLKGtK7ZXTNUi8wlCprgE7fy8mq44T5ifKo2Kdrm6IOGkSP/Hj6SOY6 +4PWVgu+1aJ0zkDekL7DVOxsJhnys10n8z8Q7XyrT4Gol1o9k/52nLm6MDUGbJHZ8pM/ vybw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UlQxktio; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id t184-20020a6381c1000000b00565e0624182si4369538pgd.404.2023.09.22.13.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 13:24:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UlQxktio; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 168B08087FDE; Fri, 22 Sep 2023 11:05:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233727AbjIVSFO (ORCPT + 28 others); Fri, 22 Sep 2023 14:05:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233523AbjIVSFJ (ORCPT ); Fri, 22 Sep 2023 14:05:09 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A48835AE for ; Fri, 22 Sep 2023 10:54:16 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-690f9c787baso2171357b3a.1 for ; Fri, 22 Sep 2023 10:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405255; x=1696010055; 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=jdTn/0muvJtiHpvCIE7e0tTaPM/Ce4Zkoiyha7khL+I=; b=UlQxktioAjNkad4gZJKZ3WbYGMg5yIs0Yh9m2iDqQVXAgOoriuE0tSLDN+lA/IqKwH 6hLhMgdAD89E9W4jXDkH/19Z3TaevNbAGRJTytxTFylNUFODC1jNz8u+GU7/s+/XJiQG PffFp1jOr+e8wQ79XoK7wGRyfeh0I0jVYzQ9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405255; x=1696010055; 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=jdTn/0muvJtiHpvCIE7e0tTaPM/Ce4Zkoiyha7khL+I=; b=Ha3yKAcoEHnf+j0Fo4w+d7zRzm2e0+RtMap5xd8RCYqPBLoSfa9b846NCf1jZd53M0 P84SOO75Dd9xH+3hj/Jim1ufxLXlZ+ZOSvSnriR8b1ai5qwaIbSqJff761kbG4HuByPm 6h5qPIyqfuRsqnQl490I0ICjrGdVkdUJOCHRjjXYIEzRLhIMOL3otad3veWnG0g6S6FK xzkIaCcuw2Gahh2bf8f6LA1+3ziq1oUTPqI+l8b8Ox6F8bQmP5IfSKBCVbZlotYSS2W8 YNaSRN/5c2vd3Zu7E9MBnAubU63jGW8EHt5cSffroYp/A91sHqN4S2dJnbfAVHVuegNQ tC4w== X-Gm-Message-State: AOJu0YxC5nvJUrO4z2qYgJNLv4LFzxS9Dq3WhNFZGdVQofCc5Jtlaflj nYBxQNoyu3Pbo3iP6PxNd1r+yA== X-Received: by 2002:a05:6a00:a1b:b0:691:1eb:7dda with SMTP id p27-20020a056a000a1b00b0069101eb7ddamr125247pfh.7.1695405255436; Fri, 22 Sep 2023 10:54:15 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id k15-20020aa792cf000000b0068a3f861b24sm3462729pfa.195.2023.09.22.10.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:54:15 -0700 (PDT) From: Kees Cook To: Andy Gross Cc: Kees Cook , Bjorn Andersson , Konrad Dybcio , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-arm-msm@vger.kernel.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] soc: qcom: smem: Annotate struct qcom_smem with __counted_by Date: Fri, 22 Sep 2023 10:54:14 -0700 Message-Id: <20230922175413.work.929-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1341; i=keescook@chromium.org; h=from:subject:message-id; bh=QPRDelWAkTRqn7WkklPCzYdZBpFhCd5JrP57gKSvApU=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdTF73/unAW40zqEdxsHteb4OckB4oasGzAI8 NOpnPkmZimJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UxQAKCRCJcvTf3G3A JkzBD/4tqXg1cj8rIGdfiTLxyn+Fxw2EOGzdNwoaHT+gnQ4/WAFF+cBiQDT2pw5MErwxaFPvgTp nxLcMPJidI5ovUXQBW/ZmmX7O90D2J3ZEYdglHZa+igB3Y5IoFPr1ZKfMFYNBM0dcQmqFhKrWpW efiU/f2+Be+SS4g0eKcXI9WNlEXYuXkJ+GdH67IVoy0Pic9i/ng49XRXo25WO2jClcXKUQPK5zf NEg2VxWNLH92GFejJSP/yNWH6s1cPSezw17mzWthPUDQMo+N5asZtkgbOuHjVRt0nala2sjQqAo 6TLnQLCQj7RIr818kuvGwDF3j45J2ec/0w7e8KIz/rIpLqu0MEwHLqbWvxrk3aH7vwhitPQ3E73 UbuwnVKSaKsZ8r5p1OgT/QcV0wdx/51pXGa8ffvUGGwmrEdhH4lKxsNKxDzRy/dZcAQ2QRkcGPx rTiKQDfoLTwp+kXkd6vF6597phWgvNm6ePlS7/3tIPIz69azGs1Enezefya5sAYYbiTneBFOMLG Y6lqKInf5HKwR3R8S/3m4EzZsvN0M5jg4xhXSIfH5kRBJ9VDNWL0baQuXQqDeiYfi2DFhA32zK5 AfrO6Wej/d4qssRVsFyEjZS0f4YAmRFbPNrwn2zeXDGHm0oKKPsBFXyazqjf6GT40wWfxuIB+Yf MxEssqC L+wdL2PA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 22 Sep 2023 11:05:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777770683045747430 X-GMAIL-MSGID: 1777770683045747430 Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct qcom_smem. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Andy Gross Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Tom Rix Cc: linux-arm-msm@vger.kernel.org Cc: llvm@lists.linux.dev Signed-off-by: Kees Cook --- drivers/soc/qcom/smem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index d4a89d2bb43b..4ce9cf1477ac 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -285,7 +285,7 @@ struct qcom_smem { struct smem_partition partitions[SMEM_HOST_COUNT]; unsigned num_regions; - struct smem_region regions[]; + struct smem_region regions[] __counted_by(num_regions); }; static void *