From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7AE7CDB47E for ; Thu, 12 Oct 2023 16:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nCWtxbYe7bYIt8DKht+TsACnafyo3WWxhz4kmZXf0Wo=; b=bmHqHTpE1s+oIl PCCk1O537rK6H9z1QG5erDEJbKLAqTHN/4chXiqLytb/7+r/nyIGUf/ej807/T1OVCqJ9TAYTao+I /3clRnc9CrFc86g/dGkaM7AUqXJ923oNUFlZxmNC4rZxNkm0w3QEXMXGIdT8AG7N55VERmSahelk9 GL13DiOip/hrXHC8mEbnAqtHkoOc9XRQVc+bakfGcTOGgIZyjd+J9T9NrmNIPwIH+uulLKIAg+RsF slXJJu0KGaTCOgWA9GPEXhI+1vybEBw38ouvylxMrTqu5WA85WsvIEd4p0YygmYTugvxmwwwIbsKU R3ow9aJjOM9O6nFIOAJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqyRm-001OpZ-2M; Thu, 12 Oct 2023 16:22:02 +0000 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqyRk-001OmM-17 for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2023 16:22:01 +0000 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-35754465cb3so3961915ab.0 for ; Thu, 12 Oct 2023 09:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1697127711; x=1697732511; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RnUFxt3XAIfdwYUO6iyQ755NzkFZ938qAzLabRmEMTQ=; b=G21YZqacmaZnGJx18Vo3Zslc8/K3k0wthulMvzaLkR/Y/elhdAST7SWvHox27YecmP yUzNARumVGsf5U0tqxv9lacMItNT4aYzyaRKTJrovn1X1Zh8sXYskQojMu8LRRtWgxCi uKUWbBQu0jsAf02FyX7IP5NEBDQTqpUidp9gk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697127711; x=1697732511; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RnUFxt3XAIfdwYUO6iyQ755NzkFZ938qAzLabRmEMTQ=; b=Up/U4CPnxZmsbuQ759eirtvRYl1SuvyZeh2CTLthpxjCZGYBmwQINYkinXUN27GY/Q qdtBB9dDmwahuL2U3zl9gqhjoCgHZUTIz+RUSIUGjN1hIlu635nAVI/+lTynB59i6mN2 9lz0GVOx1luEqpT/CN7B+XZ/FSN4LRZ8L24UClk2dTXBpX9cu7cHvme8vEf2Y9ms8FUg thrQI2ZZ7mEnX0WDCcsjablNMGLavflY+hCZ18K2/CvP7bK4PYH88NLjUo2cBTWVnVcd E65IcDyaGsN2EaNPSepDZpzF3RmxbaL8aCHtsqZPhQ79gucPcRPC08qQs+Q1QBF0iHCf sSeA== X-Gm-Message-State: AOJu0YyXY90NCqNa+6fUR87BWCNrINS6+CxsW2fnKeBVaR9V8BEDFusL KEm/N0YwJMlv66OQECaLVsc1cw== X-Google-Smtp-Source: AGHT+IEWGQ9eUG3d0le5HxUu8fZk/NWTi2Ecg9QtVgd0vbLPSzFyiDtZh8Vq3M+46SAhJg6gaiMmZg== X-Received: by 2002:a05:6e02:b22:b0:34f:f6f0:d4eb with SMTP id e2-20020a056e020b2200b0034ff6f0d4ebmr30650521ilu.21.1697127711489; Thu, 12 Oct 2023 09:21:51 -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 n7-20020a62e507000000b00693411c6c3csm11927054pff.39.2023.10.12.09.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 09:21:51 -0700 (PDT) Date: Thu, 12 Oct 2023 09:21:50 -0700 From: Kees Cook To: "Gustavo A. R. Silva" Cc: Michael Turquette , Stephen Boyd , Nobuhiro Iwamatsu , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH 2/2][next] clk: visconti: Add bounds-checking coverage for struct visconti_pll_provider Message-ID: <202310120921.3F24CB2E@keescook> References: <675633f7ae9893371d35b238f06fd02a3acffebb.1697076650.git.gustavoars@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <675633f7ae9893371d35b238f06fd02a3acffebb.1697076650.git.gustavoars@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231012_092200_382546_43021A7F X-CRM114-Status: GOOD ( 18.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Oct 11, 2023 at 08:18:45PM -0600, Gustavo A. R. Silva wrote: > In order to gain the bounds-checking coverage that __counted_by provides > to flexible-array members at run-time via CONFIG_UBSAN_BOUNDS (for array > indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions), > we must make sure that the counter member, in this particular case `num`, > is updated before the first access to the flex-array member, in this > particular case array `hws`. See below: > > commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with > __counted_by") introduced `__counted_by` for `struct clk_hw_onecell_data` > together with changes to relocate some of assignments of counter `num` > before `hws` is accessed: > > include/linux/clk-provider.h: > 1380 struct clk_hw_onecell_data { > 1381 unsigned int num; > 1382 struct clk_hw *hws[] __counted_by(num); > 1383 }; > > However, this structure is used as a member in other structs, in this > case in `struct visconti_pll_provider`: > > drivers/clk/visconti/pll.h: > 16 struct visconti_pll_provider { > 17 void __iomem *reg_base; > 18 struct device_node *node; > 19 > 20 /* Must be last */ > 21 struct clk_hw_onecell_data clk_data; > 22 }; > > Hence, we need to move the assignments to `ctx->clk_data.num` after > allocation for `struct visconti_pll_provider` and before accessing the > flexible array `ctx->clk_data.hws`. And, as assignments for all members > in `struct visconti_pll_provider` are originally adjacent to each other, > relocate all assignments together, so we don't split up > `ctx->clk_data.hws = nr_plls` from the rest. :) > > Signed-off-by: Gustavo A. R. Silva Looks good; thanks! Reviewed-by: Kees Cook -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel