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 X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 789BEC43460 for ; Thu, 22 Apr 2021 00:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E2DC61406 for ; Thu, 22 Apr 2021 00:22:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343870AbhDVAW4 (ORCPT ); Wed, 21 Apr 2021 20:22:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243936AbhDVAWu (ORCPT ); Wed, 21 Apr 2021 20:22:50 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1058C06138B for ; Wed, 21 Apr 2021 17:22:15 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id b17so31578122pgh.7 for ; Wed, 21 Apr 2021 17:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=p8niERqEMmt8YjmaM1PtQAVz464O833KbGembPi2y0E=; b=UefOwOup5y0pyfH32nf6OFSEEkcVRVF2OscZznFH7JBu9toj/FtY7EtRGbK+sT4NUf Nytki2qej3Z7kUdfYxWEV5tQu+wTtewDk3htdtON2LhsZUBgkLqDKh++3TFbdORVQIdm DT9xI9i5rjOyO9p7LJzhozfRr9AWY/dPxee54= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=p8niERqEMmt8YjmaM1PtQAVz464O833KbGembPi2y0E=; b=a0jsPmOvReGEnyPUIYUK0Sc+kN28lf+7RgEvhoMSpUTLt3DfCZMs6FowUjRtn+SAdk paJkjVxF8ah/17L+EksrSnSSY8p5pj1gM/67Qb0Kmi32JqIRpOYazv2JFrJH2YJ26m9C d+HlOt5IHVfc8MIcOExwSjBDScPvA40T3pCFLFs1VYiCjGUfGvqk7DWhuZqvHkv1NDeg VEDtP0x2h/A0PAyy0WLyn28BTAIZJBGU+L2OP0mjvbkeocXrzoXqECLz9EVlHEpyg32U EfxBdv8pslIBAzO7JIuS3KteeYFJYNLKlVTNz9yzoMXfkjwT9P2k/Q2mrQYngkkQtp/L Ci3g== X-Gm-Message-State: AOAM531YLTAKv/HkDozIbw345Lwq8WO92KT7BYxicQA+UEQ7/zFZ6GJ0 Rths3xyW5uDoDVhCMrmLT0VXjw== X-Google-Smtp-Source: ABdhPJxS8aW6dywteQ1+rUTpiZb9cufwwyO3HwUBb/h/q1y+aJMsTzS6/dcL2MAoZRfuLotwCLRp2g== X-Received: by 2002:a63:483:: with SMTP id 125mr750968pge.406.1619050935402; Wed, 21 Apr 2021 17:22:15 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id i18sm340349pfq.59.2021.04.21.17.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 17:22:14 -0700 (PDT) Date: Wed, 21 Apr 2021 17:22:11 -0700 From: Kees Cook To: "Gustavo A. R. Silva" Cc: Johannes Berg , "David S. Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH][next] wireless: wext-spy: Fix out-of-bounds warning Message-ID: <202104211722.C35B177936@keescook> References: <20210421234337.GA127225@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210421234337.GA127225@embeddedor> Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Wed, Apr 21, 2021 at 06:43:37PM -0500, Gustavo A. R. Silva wrote: > Fix the following out-of-bounds warning: > > net/wireless/wext-spy.c:178:2: warning: 'memcpy' offset [25, 28] from the object at 'threshold' is out of the bounds of referenced subobject 'low' with type 'struct iw_quality' at offset 20 [-Warray-bounds] > > The problem is that the original code is trying to copy data into a > couple of struct members adjacent to each other in a single call to > memcpy(). This causes a legitimate compiler warning because memcpy() > overruns the length of &threshold.low and &spydata->spy_thr_low. As > these are just a couple of members, fix this by copying each one of > them in separate calls to memcpy(). > > Also, while there, use sizeof(threshold.qual) instead of > sizeof(struct iw_quality)) in another call to memcpy() > above. > > This helps with the ongoing efforts to globally enable -Warray-bounds > and get us closer to being able to tighten the FORTIFY_SOURCE routines > on memcpy(). > > Link: https://github.com/KSPP/linux/issues/109 > Reported-by: kernel test robot > Signed-off-by: Gustavo A. R. Silva Thanks! Reviewed-by: Kees Cook -Kees > --- > net/wireless/wext-spy.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/net/wireless/wext-spy.c b/net/wireless/wext-spy.c > index 33bef22e44e9..bb2de7c6bee4 100644 > --- a/net/wireless/wext-spy.c > +++ b/net/wireless/wext-spy.c > @@ -120,8 +120,8 @@ int iw_handler_set_thrspy(struct net_device * dev, > return -EOPNOTSUPP; > > /* Just do it */ > - memcpy(&(spydata->spy_thr_low), &(threshold->low), > - 2 * sizeof(struct iw_quality)); > + memcpy(&spydata->spy_thr_low, &threshold->low, sizeof(threshold->low)); > + memcpy(&spydata->spy_thr_high, &threshold->high, sizeof(threshold->high)); > > /* Clear flag */ > memset(spydata->spy_thr_under, '\0', sizeof(spydata->spy_thr_under)); > @@ -173,10 +173,10 @@ static void iw_send_thrspy_event(struct net_device * dev, > memcpy(threshold.addr.sa_data, address, ETH_ALEN); > threshold.addr.sa_family = ARPHRD_ETHER; > /* Copy stats */ > - memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality)); > + memcpy(&threshold.qual, wstats, sizeof(threshold.qual)); > /* Copy also thresholds */ > - memcpy(&(threshold.low), &(spydata->spy_thr_low), > - 2 * sizeof(struct iw_quality)); > + memcpy(&threshold.low, &spydata->spy_thr_low, sizeof(threshold.low)); > + memcpy(&threshold.high, &spydata->spy_thr_high, sizeof(threshold.high)); > > /* Send event to user space */ > wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold); > -- > 2.27.0 > -- Kees Cook