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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 E0A7CC4338F for ; Wed, 28 Jul 2021 18:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2BE36101B for ; Wed, 28 Jul 2021 18:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231213AbhG1S4J (ORCPT ); Wed, 28 Jul 2021 14:56:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbhG1S4E (ORCPT ); Wed, 28 Jul 2021 14:56:04 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08A87C061757; Wed, 28 Jul 2021 11:56:00 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id o7so3388806ilh.11; Wed, 28 Jul 2021 11:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=pg9Oc8FexJdwg++WGxFIyzfbO7HtZXQu4+lhfbZZJSA=; b=SmUnU1tPVN9i/9tG/rMNoyq8GC2Ca9VXG2fndr5Q7lbUN7q2OvL7b3A8tyIlk4aRZO 8CxuepNlFVgtbqoM3ADQ3U0+DYSTh4XKY1ShBRwP2xptYX4NzEjxotT52leIbd5xNRXk 9vOonTxqSQqQW8naRs/ta+UU9thoYqHRLs8DxUAFrNPA0djreJxetA6MW8BtY4WeIUIW dOTRz3L5cqS+wmNpuKdYDrs8Y7JxgzfS82zfkL2T7J9e0mh4UxOrd8m2b0kxlUw+Ng/I ath2ZAyFnQXTEeGUJcV4oPxvcRcr2dsP1ecLOrYEwKb4egINVvb+Xoa2A3ZtaP1NLjlz iCpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=pg9Oc8FexJdwg++WGxFIyzfbO7HtZXQu4+lhfbZZJSA=; b=E7TeiL/uFCWN5lGIP/AaziPS8B0m19tsCXl7RrDPQSxzSx0UfqDNLzptaKx7fk8Ltr mhb8vqEguHEzKgwDle028s8DV+flYOX7rU969qshszJeM43LsdSpMSb1woeWy7Id5Rm9 ThU7eS63gtd30QcJJy0yDs3sX1FTPJ7buEpjwvRgpJKRYvK9G/bdu81AuppMnUY7Ae35 AzIMpw3ZT2m3v3liSfT41PFaOYxanb49LSWr/BCKvfq82/dJwqjSs9JCweYFHlQDKDVB 6+s2t9Du84F/HwxYXC704+tJroK5NH7H1uprQfRNGHpBcXo1sZhg/mxkzcmrDqb0Bsx0 0Nzg== X-Gm-Message-State: AOAM533k8VQmDQY3gRxNKQsVYfO3QRn6irDoCu/y6na1CvrPKQXsvtQ3 PP77J0UluTIVPtcQ0oef+RfXA/sfRcM1ALJ8RKU= X-Google-Smtp-Source: ABdhPJzdp7XedqkKalo1YzTM6wrHzAyIyMCWMFfqhgcBbZM/+eDvInL7H0YNQ6mczgM/TVmUc+xtfPhLFrpBLGI8h4k= X-Received: by 2002:a05:6e02:dcd:: with SMTP id l13mr851205ilj.300.1627498559514; Wed, 28 Jul 2021 11:55:59 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6e04:29b:0:0:0:0 with HTTP; Wed, 28 Jul 2021 11:55:58 -0700 (PDT) In-Reply-To: <20210727205855.411487-16-keescook@chromium.org> References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-16-keescook@chromium.org> From: Stanislav Yakovlev Date: Wed, 28 Jul 2021 22:55:58 +0400 Message-ID: Subject: Re: [PATCH 15/64] ipw2x00: Use struct_group() for memcpy() region To: Kees Cook Cc: linux-hardening@vger.kernel.org, "Gustavo A. R. Silva" , Keith Packard , Greg Kroah-Hartman , Andrew Morton , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-staging@lists.linux.dev, linux-block@vger.kernel.org, linux-kbuild@vger.kernel.org, clang-built-linux@googlegroups.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28/07/2021, Kees Cook wrote: > In preparation for FORTIFY_SOURCE performing compile-time and run-time > field array bounds checking for memcpy(), memmove(), and memset(), > avoid intentionally writing across neighboring fields. > > Use struct_group() in struct libipw_qos_information_element around > members qui, qui_type, qui_subtype, version, and ac_info, so they can be > referenced together. This will allow memcpy() and sizeof() to more easily > reason about sizes, improve readability, and avoid future warnings about > writing beyond the end of qui. > > "pahole" shows no size nor member offset changes to struct > libipw_qos_information_element. > > Additionally corrects the size in libipw_read_qos_param_element() as > it was testing the wrong structure size (it should have been struct > libipw_qos_information_element, not struct libipw_qos_parameter_info). > > Signed-off-by: Kees Cook > --- > drivers/net/wireless/intel/ipw2x00/libipw.h | 12 +++++++----- > drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 8 ++++---- > 2 files changed, 11 insertions(+), 9 deletions(-) > Acked-by: Stanislav Yakovlev Looks fine, thanks! Stanislav. 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=-10.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 241B6C4338F for ; Wed, 28 Jul 2021 19:53:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC4E960E9B for ; Wed, 28 Jul 2021 19:53:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CC4E960E9B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D1D26E887; Wed, 28 Jul 2021 19:53:10 +0000 (UTC) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C9036E0F5 for ; Wed, 28 Jul 2021 18:56:00 +0000 (UTC) Received: by mail-il1-x132.google.com with SMTP id x7so82569ilh.10 for ; Wed, 28 Jul 2021 11:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=pg9Oc8FexJdwg++WGxFIyzfbO7HtZXQu4+lhfbZZJSA=; b=SmUnU1tPVN9i/9tG/rMNoyq8GC2Ca9VXG2fndr5Q7lbUN7q2OvL7b3A8tyIlk4aRZO 8CxuepNlFVgtbqoM3ADQ3U0+DYSTh4XKY1ShBRwP2xptYX4NzEjxotT52leIbd5xNRXk 9vOonTxqSQqQW8naRs/ta+UU9thoYqHRLs8DxUAFrNPA0djreJxetA6MW8BtY4WeIUIW dOTRz3L5cqS+wmNpuKdYDrs8Y7JxgzfS82zfkL2T7J9e0mh4UxOrd8m2b0kxlUw+Ng/I ath2ZAyFnQXTEeGUJcV4oPxvcRcr2dsP1ecLOrYEwKb4egINVvb+Xoa2A3ZtaP1NLjlz iCpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=pg9Oc8FexJdwg++WGxFIyzfbO7HtZXQu4+lhfbZZJSA=; b=JpUMI8fSpBrehLE3EZzLaBgTKlNVwT6DrNHpO5dx+KbEN0wykv17iTkDY80z/MNbnG 6D3PFeD96z10iS9XfcyeTWcMt080JXMp93/IDeMafEhRYnxlpy54CyNGrM6OZv0i97Iv tzq5iSkSST+MW2Fbok9ovI9Ab5dN+azOhvvcBG0RTFNa049C5Zg14u/JtpimjezyO21l tCSe38+qfYQXvk6w6DnmUjp0DJW2lmVzDs3MCZPl82tszp3mwKaV/S/raPXSaWCfbm15 q86A1g2R6PmoFg7pSwor8wrf82unKs6qRqgD5cRGXQtg0O75aRSQvaQ7gHIgnatV/IFB vDoA== X-Gm-Message-State: AOAM533kOf+RgiOK35H6VFcxVwnTjQ+PhrIsNmExMqIGjZ6QRCgCMHsL vusWdZHQ0YSerEkGn95+2ogKymJZJXgwbeFCDNs= X-Google-Smtp-Source: ABdhPJzdp7XedqkKalo1YzTM6wrHzAyIyMCWMFfqhgcBbZM/+eDvInL7H0YNQ6mczgM/TVmUc+xtfPhLFrpBLGI8h4k= X-Received: by 2002:a05:6e02:dcd:: with SMTP id l13mr851205ilj.300.1627498559514; Wed, 28 Jul 2021 11:55:59 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6e04:29b:0:0:0:0 with HTTP; Wed, 28 Jul 2021 11:55:58 -0700 (PDT) In-Reply-To: <20210727205855.411487-16-keescook@chromium.org> References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-16-keescook@chromium.org> From: Stanislav Yakovlev Date: Wed, 28 Jul 2021 22:55:58 +0400 Message-ID: Subject: Re: [PATCH 15/64] ipw2x00: Use struct_group() for memcpy() region To: Kees Cook Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Wed, 28 Jul 2021 19:53:08 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kbuild@vger.kernel.org, Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Gustavo A. R. Silva" , linux-block@vger.kernel.org, clang-built-linux@googlegroups.com, Keith Packard , linux-hardening@vger.kernel.org, netdev@vger.kernel.org, Andrew Morton Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 28/07/2021, Kees Cook wrote: > In preparation for FORTIFY_SOURCE performing compile-time and run-time > field array bounds checking for memcpy(), memmove(), and memset(), > avoid intentionally writing across neighboring fields. > > Use struct_group() in struct libipw_qos_information_element around > members qui, qui_type, qui_subtype, version, and ac_info, so they can be > referenced together. This will allow memcpy() and sizeof() to more easily > reason about sizes, improve readability, and avoid future warnings about > writing beyond the end of qui. > > "pahole" shows no size nor member offset changes to struct > libipw_qos_information_element. > > Additionally corrects the size in libipw_read_qos_param_element() as > it was testing the wrong structure size (it should have been struct > libipw_qos_information_element, not struct libipw_qos_parameter_info). > > Signed-off-by: Kees Cook > --- > drivers/net/wireless/intel/ipw2x00/libipw.h | 12 +++++++----- > drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 8 ++++---- > 2 files changed, 11 insertions(+), 9 deletions(-) > Acked-by: Stanislav Yakovlev Looks fine, thanks! Stanislav.