Date:   Sat, 28 Jan 2023 14:43:28 +0100
From:   Simon Horman <simon.horman@corigine.com>
To:     Kees Cook <keescook@chromium.org>
Cc:     Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH] net: sched: sch: Bounds check priority
Message-ID: <Y9UmgDQibo7Z0Nqz@corigine.com>
References: <20230127224036.never.561-kees@kernel.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230127224036.never.561-kees@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gF1wb9wtBTdqH6Nok4rf8Cy3yWI1QjpPwhvBEaYrNChPgdym7wZt40Jlkpqb?=
 =?us-ascii?Q?NEY9Z7R+eUIovscS8ENbiC/lmTHzJ4Rtm7afClZxbKsuFqz907xBXXpgvUbk?=
 =?us-ascii?Q?RHC+b3oiFzfrpQYnCVMhCC9D10SLbadKlCZjXg32vbKbNSYIdj4ZgQ5H6tJ7?=
 =?us-ascii?Q?i6N7HQL4WsOseaQBfl8189CO1T4RvPPgtIKQEXyDhtxFLkC49v3HRM32O6Eb?=
 =?us-ascii?Q?MXWhzZkh8o+FQV6cirq4+82gpPeTG7ijqQKhsrfLJ9ATpxsIc9WZegxStRl8?=
 =?us-ascii?Q?+VfXnH8jrnchCMmlgAR0GqPa6SBNf8KegHqBBiEtQCp6z5Xia2pEwDzF6tLG?=
 =?us-ascii?Q?LbxxN9VtDDSF8rdK/uNJwxc4by23tYRX63GvCO/lGZcSwJ0v0BFkhUJ0MD9f?=
 =?us-ascii?Q?nDtDVqjFTwNf1ZhbIlFRQO1tH2SWvNQyRqp9eQ+5zIScTuX8R2KfVsMhbkpE?=
 =?us-ascii?Q?vnHqSJtKX3afufpZ9eY56X9LoPUbD+Q4HaumXAqYdFTXlcD7h0LxKbosJ/3R?=
 =?us-ascii?Q?9l3+jBU/oFzeZk9YdsT6ZwjR42QMfrEVwvxpS7yHBSu2FffgiMn9m49UR1DP?=
 =?us-ascii?Q?OVQgMaIp4uruFGk2iwuOK7ZBBt2ny0MWwcdY4MlFDK6zH/8tui7wWrl4yWkO?=
 =?us-ascii?Q?5H1/a6BeEw3TJ5aWj2IPjDl7wUUrldwv+Mw4VrVHDWGEcHqwYFHQu7N/0TFX?=
 =?us-ascii?Q?hSbmnyNWHqrZ2yubcVmotCOdW5T1YgbSJZ+PXIim6BYx9k3VoCh6u0Dai640?=
 =?us-ascii?Q?zWcKjKjAKTb04EZX2ndTjpKRM2rh5wDswWKpNgkIKuri+4tBfPQnFqnYVIlK?=
 =?us-ascii?Q?1DWEduhCGxs7A8GpJ3FDbQnzecbIqme6EgXNLhHvM1GJNDVcKoeFA85MLTEu?=
 =?us-ascii?Q?DNpQiXKJkdpZdZtwjS9W7vNRnmBIMHCm230+2MlWmD0BDb0BZTwmj1vdcMSE?=
 =?us-ascii?Q?K94dKeLwzDi7kdgpOqOpAzbioZHngTpsF6J2iPZ87nkZSes91nNQ+NtaUMpq?=
 =?us-ascii?Q?TddFNcxe1DMjFj2yItfmUKVj5BEjrHC3oAaIb9nTAOILeNIO1oFNRPpaXDOF?=
 =?us-ascii?Q?leZq3/RM1e3/cbWinkD96jfmah2TvuKlYVrU0WUtHr/2FaJbXuFg4QVBWPf6?=
 =?us-ascii?Q?jVWsZrOPnQf9d2u5YmtRoSGZs77Nu08zfjCsHpxYfPikem4DGqaNIH/xy47a?=
 =?us-ascii?Q?+ffuVfGBsM4bCtKxPwXGM7vb4hx0AM/FU+NJASPG61bW7i8fggpjKPDJLgmx?=
 =?us-ascii?Q?WOKAnW3v1M9ki6TAtQWz/I5WOqpb2xuJiKkqbrZSYu6HdPRSTYgsdz0fA2fv?=
 =?us-ascii?Q?oBt71M7tvaUArsAwMH7MPEa2NMW8kmg85JTcpJ3rfai/NKiUfCbLblr/LsYo?=
 =?us-ascii?Q?gUiQIW74bBTgtuKU/Z59kNAJmepoy+Ebh5YxuXf24QrcQBtJO+DXI6r6Z5i5?=
 =?us-ascii?Q?bnaRGgYO6QVh+obvHHMjp0g4thX7PrXBbHEbRb4/lhYF5BDvHL3zQP8De8+1?=
 =?us-ascii?Q?gNqKJ/VeLRLKmh8EUYDxB8Twun5YeTjXJBT0Vs+IcfQ9r2yYnAZsMvxjK9rv?=
 =?us-ascii?Q?Nn3cH1Uf4EnmUpi4cQr9Iuu84Tzenn8UtMO3TcQsSxfAabKhC/RC4nXILApj?=
 =?us-ascii?Q?Qj8YeHBs7pFbnAXhkZvSk74pffW/+UbjeMz8N4bt8IZl1WwMHd2yUO3TwgLd?=
 =?us-ascii?Q?8D6k1g=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fe59e432-a4a5-4ba4-5e90-08db0135a691
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 13:43:34.4059
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VrwUSCQr3nXvye6xh45RFrd3gw2hJxsxQyXd3CkCkoQrpLGjf5h62yUOJhep0yXsn5bvOTFE4N2sgtSm0z+K+UBdmzhF+MhU04MDLcWSzng=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5444
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Jan 27, 2023 at 02:40:37PM -0800, Kees Cook wrote:
> Nothing was explicitly bounds checking the priority index used to access
> clpriop[]. WARN and bail out early if it's pathological. Seen with GCC 13:
> 
> ../net/sched/sch_htb.c: In function 'htb_activate_prios':
> ../net/sched/sch_htb.c:437:44: warning: array subscript [0, 31] is outside array bounds of 'struct htb_prio[8]' [-Warray-bounds=]
>   437 |                         if (p->inner.clprio[prio].feed.rb_node)
>       |                             ~~~~~~~~~~~~~~~^~~~~~
> ../net/sched/sch_htb.c:131:41: note: while referencing 'clprio'
>   131 |                         struct htb_prio clprio[TC_HTB_NUMPRIO];
>       |                                         ^~~~~~
> 

...

> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  net/sched/sch_htb.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

I'm not sure what will happen if we hit the 'break' case.
But I also think that warning and bailing out is an improvement on whatever
happens now if that scenario is hit.

Reviewed-by: Simon Horman <simon.horman@corigine.com>

> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
> index f46643850df8..cc28e41fb745 100644
> --- a/net/sched/sch_htb.c
> +++ b/net/sched/sch_htb.c
> @@ -431,7 +431,10 @@ static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl)
>  	while (cl->cmode == HTB_MAY_BORROW && p && mask) {
>  		m = mask;
>  		while (m) {
> -			int prio = ffz(~m);
> +			unsigned int prio = ffz(~m);
> +
> +			if (WARN_ON_ONCE(prio > ARRAY_SIZE(p->inner.clprio)))
> +				break;
>  			m &= ~(1 << prio);
>  
>  			if (p->inner.clprio[prio].feed.rb_node)
> -- 
> 2.34.1
>