Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Message-ID: <d7462ae5-c971-452f-49d7-855f60c850d3@intel.com>
Date:   Thu, 21 Sep 2023 16:14:30 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] sky2: Make sure there is at least one frag_addr available
Content-Language: en-US
To:     Kees Cook <keescook@chromium.org>
CC:     Mirko Lindner <mlindner@marvell.com>,
        Stephen Hemminger <stephen@networkplumber.org>,
        "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>,
        kernel test robot <lkp@intel.com>,
        <linux-kernel@vger.kernel.org>, <linux-hardening@vger.kernel.org>
References: <20230920202509.never.299-kees@kernel.org>
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <20230920202509.never.299-kees@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y3JEalBtbGF5dVpzektPMEJDdkxjdEkveVBtb0xqLzNvc1NuK3BzZUFzd2tW?=
 =?utf-8?B?VkgyZWgxemxMQ1JuYWVrNENJWkowRHE5eDZWdG5KaXM1UXJLdXJxMzBDTUtq?=
 =?utf-8?B?Sk8rQzNRbjZvUnFxeVNKUGc4R0hCNlRXaW9VUDNNcWtvOHh2RUlQZ0RHR1Fa?=
 =?utf-8?B?RG5nYmJYcmovL3cyMjg5ZXRVcnQzN0UrS1BqV2pIOGVTUmV5QmtHa0Vyb1hM?=
 =?utf-8?B?MTMyT2JWc1MxbU9hcHRENWdRc3dETG9yQTF5cUI1aWErZEt1Vis5SzVlcytN?=
 =?utf-8?B?dlVzYlV4dlplYStrYS9TZFBsaFRveHNqNmtYeGtBeDhObUlPT1I3ZTRmQzA2?=
 =?utf-8?B?bUNKQUxYYlpZRXp6TGg5OC9MdlZaaUJYbHp2cUtTQmtBeWIweFEzV2hldElm?=
 =?utf-8?B?UllvOERKWUY5MjdFUVh3TWRUNmxHUGFmaHdKaE8yK2dkb1NMZnpYU3VucUJJ?=
 =?utf-8?B?cTVkYVU0Z0FhMHMyZS9xWWZFMHgycEt1VDlhOGljVm5vOTNUVkJ0NlB1cmI0?=
 =?utf-8?B?cDhhd0k0eHEwcFRyV1BqUXptVkdYc2dkZ1VTMlBaSjdsWHVCakdMYzNTNkFw?=
 =?utf-8?B?dWdDcUR6cTIxV3hOSWxOeFBoekZvRzg1QnpIa2t1dXpiYXJFZTN3cGE0Z3dF?=
 =?utf-8?B?bnFxR2VNaXV1ZklWL0cxS05LUDV2SkpqNXBVbWlkOTI0ekc5aGJyUll5dWFT?=
 =?utf-8?B?ZDVlUUFjNThCN2l0b3hyMlViRUQxLzZNT29rMGoxWmRCclQvUUpSbENhcnpm?=
 =?utf-8?B?djNMRVMrbFhNTmpNeFNqeVhla3RiVzBlZmV3WWc4aVpUMVIyNXd6emNzTHJY?=
 =?utf-8?B?dUUyRmVqVklwMXliWEx4a0NxalB2WFBwUExlTkxWRHFEeTBVeDNqb2FPOGJC?=
 =?utf-8?B?QzdwVlQwTGRLamVZTEdxb2R2OTZNWEN4OXRTYWQvSEJydlNHK2JiQnVUWDhk?=
 =?utf-8?B?STJXNU1pZHFkdzRZWnAyZnBGMlVTRmIrdGhWREtjSnFLZzQ2RW5SbDV0MHNT?=
 =?utf-8?B?WE1PV3k0NklnVjFQcTMraTI4L2hjRy9WZXNIVHFPZFYwSnE1ME8vLy9vc20r?=
 =?utf-8?B?THlKUndtcFhDODQ4Zlo0VXM5RDJUbmxCUzJPdHJucW1YZkErTW81ZnNueUtx?=
 =?utf-8?B?QzNsajZyb1hHRUV6dlgvQXdpVFI3ZHI1K3NWV2QvZSt0TTE2cFNIVkZmNGpz?=
 =?utf-8?B?aENpMmVjeU1aZTFRNmdIcERQclZjNUxacXhDTmdIYnFQbXpPQ0lYWS96d3RE?=
 =?utf-8?B?SDRjdXllaTFSNVcxYUVKSTcvd1hjcnRBSFZ5NmlmVEp6M2dQUXJNZ2Zvc2p3?=
 =?utf-8?B?UmRWRit2QlBWb3BwQjdBdU5RNVJBODc3WXFnSDd3YU5MbmxmckxNejcySis3?=
 =?utf-8?B?NWxsc1N3VEVLdDFmQWpFRVpxRFk5SjVPc2h1WGxKc1A4cXNTczJEdmJ4am1Y?=
 =?utf-8?B?WXQyaUlTM1A5SURkYUpGZENobzVaZThmb3FQVEZYdVNEcnlXWkJBTUFVZW9U?=
 =?utf-8?B?dFJrb1NWMVZRZURFSThqd0lnd1RLcnllZERpc2RQVE85cnlXVnM1dUVjYTRR?=
 =?utf-8?B?cDY2bnBBUmlLTHFoQ3hScGR2anF3YklpckdEOGVGcDgwU1drUnlYWEZiQmFU?=
 =?utf-8?B?OXROVVVvd095UWZTWnFodXJoV1dhb0x4M1U0aERVbCsyU1dZVUNVSnZOckpl?=
 =?utf-8?B?MG03OTFUVFgvYzdLNDJIRzN1UVEvRG9IK0NGNWJueUh1bmFrWEh4am8rTnhV?=
 =?utf-8?B?Y0dwOFJaNG5UMk1icmVTb3l6UUl6N3MwUnBSdU1HOSs5R0NnQVMwRWxPamV2?=
 =?utf-8?B?ZE5vYXNoN0pJMTdHWHNhSG8rKy92Um9qZVpzSmQ0OENBc21vQXd3bFJ4bHJI?=
 =?utf-8?B?dkkwOTI3MHVvdVU3VDhEN3VXRlRFSEY2UHZmVGRXN2oyZk5adzlYZ0lpMFl2?=
 =?utf-8?B?ZmNNSGtrSnJianZiTE1tcHk1UU8xMlEySWxUcTZ4VWwveDF1ZFlVcDRjamVW?=
 =?utf-8?B?RDAzS0NRV0JWVCt3UVovTi9EOXFNS215bWpDZHBQMHFPbDBKTDdhSHl3TXBF?=
 =?utf-8?B?MXFSWFY5V2ZGTXdBeEJoWmhvY016QUFCZUM0NTQ0ZjJ2SzN4Y1FtNDR4OE1Y?=
 =?utf-8?B?TzJ2eVQwY1d6M2gyUEszaDJtRFUvcEk3YkNZM0ROQWxZVDRRUDg5UHpLSWVI?=
 =?utf-8?B?aUE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1715514c-4f8e-4db0-1ceb-08dbbaad3291
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2023 14:15:25.0900
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: L4ZvzvLK7uSBZZJWeKZ3elPZmq30i8OZ7V3gcfLMDujqSpN5TmaA6smsOwAfoB6FjyVozAfAYPgLGglUrycJODQfECNW+LF/GSl2ImL+fas=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5274
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
        SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 21 Sep 2023 14:12:58 -0700 (PDT)

From: Kees Cook <keescook@chromium.org>
Date: Wed, 20 Sep 2023 13:25:13 -0700

> In the likely pathological case of building sky2 with 16k PAGE_SIZE,
> make sure there is at least 1 frag_addr in struct rx_ring_info:
> 
>    In file included from include/linux/skbuff.h:28,
>                     from include/net/net_namespace.h:43,
>                     from include/linux/netdevice.h:38,
>                     from drivers/net/ethernet/marvell/sky2.c:18:
>    drivers/net/ethernet/marvell/sky2.c: In function 'sky2_rx_unmap_skb':
>    include/linux/dma-mapping.h:416:36: warning: array subscript i is outside array bounds of 'dma_addr_t[0]' {aka 'long long unsigned int[]'} [-Warray-bounds=]
>      416 | #define dma_unmap_page(d, a, s, r) dma_unmap_page_attrs(d, a, s, r, 0)
>          |                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    drivers/net/ethernet/marvell/sky2.c:1257:17: note: in expansion of macro 'dma_unmap_page'
>     1257 |                 dma_unmap_page(&pdev->dev, re->frag_addr[i],
>          |                 ^~~~~~~~~~~~~~
>    In file included from drivers/net/ethernet/marvell/sky2.c:41:
>    drivers/net/ethernet/marvell/sky2.h:2198:25: note: while referencing 'frag_addr'
>     2198 |         dma_addr_t      frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
>          |                         ^~~~~~~~~
> 
> With CONFIG_PAGE_SIZE_16KB=y, PAGE_SHIFT == 14, so:
> 
>   #define ETH_JUMBO_MTU   9000
> 
> causes "ETH_JUMBO_MTU >> PAGE_SHIFT" to be 0. Use "?: 1" to solve this build warning.
> 
> Cc: Mirko Lindner <mlindner@marvell.com>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: netdev@vger.kernel.org
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202309191958.UBw1cjXk-lkp@intel.com/
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>

That "nobody uses this HW on non-x86 systems, why bother" is fun each time.

> ---
>  drivers/net/ethernet/marvell/sky2.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
> index ddec1627f1a7..8d0bacf4e49c 100644
> --- a/drivers/net/ethernet/marvell/sky2.h
> +++ b/drivers/net/ethernet/marvell/sky2.h
> @@ -2195,7 +2195,7 @@ struct rx_ring_info {
>  	struct sk_buff	*skb;
>  	dma_addr_t	data_addr;
>  	DEFINE_DMA_UNMAP_LEN(data_size);
> -	dma_addr_t	frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
> +	dma_addr_t	frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT ?: 1];
>  };
>  
>  enum flow_control {

Thanks,
Olek