From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE6F270 for ; Wed, 28 Jul 2021 05:46:01 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id B91F460BD3; Wed, 28 Jul 2021 05:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627451161; bh=5TT6vhaZMFh6Ixag3Q3JIRBCGhLz9P43hbzx09FExmY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=F6DkcU1tItDCras3BrqzN0yT/k/efCY4jZ2AcBGGFZyCnArMJpoDY48G8teXgWArj OKxwCtiqpI560i3ebuU+kJI+rT9CPwa7B3UNyA1ll/SaFemqgmowNM0f+E1SaNF/Qw 1NRg4+x5zFU1vDWXNXSDvARVwD9VpVh6Su5E+9ks= Date: Wed, 28 Jul 2021 07:45:59 +0200 From: Greg Kroah-Hartman To: Kees Cook Cc: linux-hardening@vger.kernel.org, "Gustavo A. R. Silva" , Keith Packard , 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 Subject: Re: [PATCH 08/64] staging: rtl8192u: Use struct_group() for memcpy() region Message-ID: References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-9-keescook@chromium.org> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210727205855.411487-9-keescook@chromium.org> On Tue, Jul 27, 2021 at 01:57:59PM -0700, Kees Cook wrote: > In preparation for FORTIFY_SOURCE performing compile-time and run-time > field bounds checking for memcpy(), memmove(), and memset(), avoid > intentionally writing across neighboring fields. > > Use struct_group() around members addr1, addr2, and addr3 in struct > rtl_80211_hdr_4addr, and members qui, qui_type, qui_subtype, version, > and ac_info in struct ieee80211_qos_information_element, 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 addr1 and qui. Additionally replace zero sized > arrays with flexible arrays in struct ieee_param. > > "pahole" shows no size nor member offset changes to struct > rtl_80211_hdr_4addr nor struct ieee80211_qos_information_element. "objdump > -d" shows no meaningful object code changes (i.e. only source line number > induced differences and optimizations). > > Signed-off-by: Kees Cook Acked-by: Greg Kroah-Hartman 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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, 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 4B828C4338F for ; Wed, 28 Jul 2021 05:46:03 +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 EBFA0600EF for ; Wed, 28 Jul 2021 05:46:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EBFA0600EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org 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 6C3CD6EC82; Wed, 28 Jul 2021 05:46:02 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FF276EC82 for ; Wed, 28 Jul 2021 05:46:01 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id B91F460BD3; Wed, 28 Jul 2021 05:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627451161; bh=5TT6vhaZMFh6Ixag3Q3JIRBCGhLz9P43hbzx09FExmY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=F6DkcU1tItDCras3BrqzN0yT/k/efCY4jZ2AcBGGFZyCnArMJpoDY48G8teXgWArj OKxwCtiqpI560i3ebuU+kJI+rT9CPwa7B3UNyA1ll/SaFemqgmowNM0f+E1SaNF/Qw 1NRg4+x5zFU1vDWXNXSDvARVwD9VpVh6Su5E+9ks= Date: Wed, 28 Jul 2021 07:45:59 +0200 From: Greg Kroah-Hartman To: Kees Cook Subject: Re: [PATCH 08/64] staging: rtl8192u: Use struct_group() for memcpy() region Message-ID: References: <20210727205855.411487-1-keescook@chromium.org> <20210727205855.411487-9-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210727205855.411487-9-keescook@chromium.org> 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, netdev@vger.kernel.org, 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, Andrew Morton Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 27, 2021 at 01:57:59PM -0700, Kees Cook wrote: > In preparation for FORTIFY_SOURCE performing compile-time and run-time > field bounds checking for memcpy(), memmove(), and memset(), avoid > intentionally writing across neighboring fields. > > Use struct_group() around members addr1, addr2, and addr3 in struct > rtl_80211_hdr_4addr, and members qui, qui_type, qui_subtype, version, > and ac_info in struct ieee80211_qos_information_element, 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 addr1 and qui. Additionally replace zero sized > arrays with flexible arrays in struct ieee_param. > > "pahole" shows no size nor member offset changes to struct > rtl_80211_hdr_4addr nor struct ieee80211_qos_information_element. "objdump > -d" shows no meaningful object code changes (i.e. only source line number > induced differences and optimizations). > > Signed-off-by: Kees Cook Acked-by: Greg Kroah-Hartman