From nobody Mon May 11 02:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90BF9C433FE for ; Mon, 18 Apr 2022 23:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234708AbiDRXUr (ORCPT ); Mon, 18 Apr 2022 19:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234649AbiDRXUm (ORCPT ); Mon, 18 Apr 2022 19:20:42 -0400 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E77823BD1 for ; Mon, 18 Apr 2022 16:18:01 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id d19so4453497qko.3 for ; Mon, 18 Apr 2022 16:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uzTGDQP0f95uJjkIzcCv5mUHYF5rmou/7UB+HwmJESo=; b=LnzjpeDIks5TxNNm0jxFG63+BZztr6COd+ExcQMvzsOqsM2haLamtMZKk1rooCKegZ w8gBU/C1SS8idFiRcEUjcNBkHGFgTft3LgIZVsVd9IbJQSPzZGwR2f603crEAbL8kW/J 8b25ke05TK3yGUKeqeKEO2VSaHD7XesZa1wMI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uzTGDQP0f95uJjkIzcCv5mUHYF5rmou/7UB+HwmJESo=; b=JHamgZ7YRleSZqSDvlDnwDp0+Y8AWMBQjxOQ9NQPCSDx02ap+nPyTWnYwzlg/yn2kP W8fVSKQfSOWnpsiNecl7Xv3I/4Js6TxzREm637B8MuXAO/EZfaE+eCisy1QMTmsRWF9b tizu1ryHxNIjbTLVclx0KhUtKtDH1ETJwgK/iyUYLwVc4U/IbQS4HxQohJ4+H0mISdvV iwm9hvK5lZGhmbdPRWrFrF3wrJPPZsnzv0DrxLuPYkvUtav35O+nnl1U/0JmKzh3mORt iviiWzJgNRPu4tZCTfFaHMlUCnclVBOOwgX3gzOPsCu79RefMYykrVa4k73CnGFThuhA fURA== X-Gm-Message-State: AOAM530QsBSuxDKiQ+AzkHjIQw1pikYxrVXFJgMLIg60dV9Y5KI4p65Y Nqxd7mGSgo5o5iIS6RdSRHWtVA== X-Google-Smtp-Source: ABdhPJxsj1wrb92DBhSr8MmPgWD1TRSXaztHAb6okgzlnASHT8TV/adbzOw2yNkVM0aCjPWfsKYqqg== X-Received: by 2002:a05:620a:1724:b0:69e:883a:85b6 with SMTP id az36-20020a05620a172400b0069e883a85b6mr6297843qkb.247.1650323880498; Mon, 18 Apr 2022 16:18:00 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id a1-20020a05622a02c100b002f17cba4930sm8214048qtx.85.2022.04.18.16.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 16:18:00 -0700 (PDT) From: Grant Grundler To: Igor Russkikh Cc: Jakub Kicinski , Paolo Abeni , netdev , "David S . Miller" , LKML , Aashay Shringarpure , Yi Chou , Shervin Oloumi , Grant Grundler Subject: [PATCH 1/5] net: atlantic: limit buff_ring index value Date: Mon, 18 Apr 2022 16:17:42 -0700 Message-Id: <20220418231746.2464800-2-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog In-Reply-To: <20220418231746.2464800-1-grundler@chromium.org> References: <20220418231746.2464800-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" buff->next is pulled from data DMA'd by the NIC and later used to index into the buff_ring[] array. Verify the index is within the size of the array. Reported-by: Aashay Shringarpure Reported-by: Yi Chou Reported-by: Shervin Oloumi Signed-off-by: Grant Grundler --- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/dr= ivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index d875ce3ec759..e72b9d86f6ad 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -981,7 +981,9 @@ int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, = struct aq_ring_s *ring) =20 if (buff->is_lro) { /* LRO */ - buff->next =3D rxd_wb->next_desc_ptr; + buff->next =3D + (rxd_wb->next_desc_ptr < ring->size) ? + rxd_wb->next_desc_ptr : 0U; ++ring->stats.rx.lro_packets; } else { /* jumbo */ --=20 2.36.0.rc0.470.gd361397f0d-goog From nobody Mon May 11 02:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0EA6C433FE for ; Mon, 18 Apr 2022 23:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234845AbiDRXUw (ORCPT ); Mon, 18 Apr 2022 19:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234591AbiDRXUq (ORCPT ); Mon, 18 Apr 2022 19:20:46 -0400 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E9FE23BF8 for ; Mon, 18 Apr 2022 16:18:06 -0700 (PDT) Received: by mail-qt1-x82c.google.com with SMTP id t2so11101341qtw.9 for ; Mon, 18 Apr 2022 16:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eGBuACRZ04g6eXXx9CXhc711yGsiIwo7BTuVUQLo/jM=; b=G3M7J2O5fbNDam/Y7wWtwO5oA+WoYmzO9/zF1ye07nxXMQvQMMCgSua+DdGg/Dzs4m iU8SUNeel2RNbTUSXTaZLngqjTqH9tou5OPzyYqHt92aR0aSHi8S8fPPeTrwqkCxRAeO LT4pFnU4i9IrYrafJ7/snP7CCh6S4W9Jspcls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eGBuACRZ04g6eXXx9CXhc711yGsiIwo7BTuVUQLo/jM=; b=F7OGHmZFDVH7fb9wrHvTR+3qO/JmJAAqg/3jd+NFV25d36ASF2F53IEhRo4OqCx6dA J9HOZwpB/ogtgsTUgOPZ9jEs7L501hYAO25vSN+XVzdFXPHFkPwovjekxjc9iTQRpyxO ErBPy/pbMXuPYOzT8bD+y39jI9K26kxBKgofpfLSNYMZWnumuNQvHzMdf2ojn7HHmASQ PyMusQa6edVNYfGwCdO+j0R7+5uzN9D0+Er1OdzpGEwUfz6OjqwC78NTzYUjrckRwJZc lYuATluwcOUDUsck2DOBPTGq6izANOble9dVwOiXTqOtvtT0G1vZn7sSSit0nTBFF+TY H5EA== X-Gm-Message-State: AOAM533w9L2X8K1JLPsTMTm1tSiW0CCTvOtuBGhF+bw5Ik3m9iMB2wc7 m1hXm3ei+2VYeoiyQEXjG+eO1Q== X-Google-Smtp-Source: ABdhPJxioJWtCIZdI8QrOclHvABvNGY9w+WxiL5bLKmhJNjlF1WwIj69Ea9szcH4umCtMgFfGbSBKQ== X-Received: by 2002:ac8:5c14:0:b0:2f2:121:66d4 with SMTP id i20-20020ac85c14000000b002f2012166d4mr3945977qti.675.1650323885286; Mon, 18 Apr 2022 16:18:05 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id a1-20020a05622a02c100b002f17cba4930sm8214048qtx.85.2022.04.18.16.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 16:18:05 -0700 (PDT) From: Grant Grundler To: Igor Russkikh Cc: Jakub Kicinski , Paolo Abeni , netdev , "David S . Miller" , LKML , Aashay Shringarpure , Yi Chou , Shervin Oloumi , Grant Grundler Subject: [PATCH 2/5] net: atlantic: fix "frag[0] not initialized" Date: Mon, 18 Apr 2022 16:17:43 -0700 Message-Id: <20220418231746.2464800-3-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog In-Reply-To: <20220418231746.2464800-1-grundler@chromium.org> References: <20220418231746.2464800-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In aq_ring_rx_clean(), if buff->is_eop is not set AND buff->len < AQ_CFG_RX_HDR_SIZE, then hdr_len remains equal to buff->len and skb_add_rx_frag(xxx, *0*, ...) is not called. The loop following this code starts calling skb_add_rx_frag() starting with i=3D1 and thus frag[0] is never initialized. Since i is initialized to zero at the top of the primary loop, we can just reference and post-increment i instead of hardcoding the 0 when calling skb_add_rx_frag() the first time. Reported-by: Aashay Shringarpure Reported-by: Yi Chou Reported-by: Shervin Oloumi Signed-off-by: Grant Grundler --- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net= /ethernet/aquantia/atlantic/aq_ring.c index 77e76c9efd32..440423b0e8ea 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -446,7 +446,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, ALIGN(hdr_len, sizeof(long))); =20 if (buff->len - hdr_len > 0) { - skb_add_rx_frag(skb, 0, buff->rxdata.page, + skb_add_rx_frag(skb, i++, buff->rxdata.page, buff->rxdata.pg_off + hdr_len, buff->len - hdr_len, AQ_CFG_RX_FRAME_MAX); @@ -455,7 +455,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self, =20 if (!buff->is_eop) { buff_ =3D buff; - i =3D 1U; do { next_ =3D buff_->next; buff_ =3D &self->buff_ring[next_]; --=20 2.36.0.rc0.470.gd361397f0d-goog From nobody Mon May 11 02:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 405FDC433EF for ; Mon, 18 Apr 2022 23:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234921AbiDRXU7 (ORCPT ); Mon, 18 Apr 2022 19:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234736AbiDRXUs (ORCPT ); Mon, 18 Apr 2022 19:20:48 -0400 Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9690723BDF for ; Mon, 18 Apr 2022 16:18:07 -0700 (PDT) Received: by mail-qt1-x82d.google.com with SMTP id hf18so10639707qtb.0 for ; Mon, 18 Apr 2022 16:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cm6vrPc6zBxtc8mQWliADJPsKgyQwKE9+4mqmo5RZKE=; b=U8a3jSUSPI7w+GxtadKgv7/XegggLYVFgOz+hbw1AvD0DG03H+DOlpsGSI6Nhwu7dd qkPGuqZr5UIW/puXFV8QaEpgY8yYz+xeQ8UH+989o0lXmrOmvXwHXy6rbIlhTMF11tyD 1/0Q5Ao2CUxstvd2S0cJxiugKkXr5HGO3TbbI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cm6vrPc6zBxtc8mQWliADJPsKgyQwKE9+4mqmo5RZKE=; b=wt5yz1AWUv7+YnTmS/PE78cgR3AL72q5JfXRLXIJ2DLcjrLb0RwVyPa5BIs7A3jA05 YlIAoQnS0l8Yyqb8ndkirFyDCIHBUYrDnIch272vg0i+EL5i3uBmdBDZE79tsmmKx1EJ p3f4g9aemviCaBZMgpDDtvg2e+0/2EMCOE8NmviK3CB7mo11bifQ8rVIN3YOrDymh+Gp dzB5Nc0BtdD6hUymJZkrWEmWcAtSmx/3Nck1XhEgFXfS3yRsNJHieQrfA4iSvvfJV8gQ uP77tXYo1a2RDmLTJIAvtRMSWjFOHtGFIHD1Bn/T85l/x47Fb/5hM8/bhQuwsctG+it3 Hqug== X-Gm-Message-State: AOAM530BluHAKvpZyOT1FDkQfvtb9kWo+VVD5ol6Y8eNFvNfH5sbGS7s I0YInc6q7/Sen8qnQEy4R3YzKw== X-Google-Smtp-Source: ABdhPJy+508q4T003VTS1J7WP9dq1N2Y5oaYvHODfUb7OW6Ht+xF09/KjxlhYz+MfAtfzD6Y71opyA== X-Received: by 2002:a05:622a:6182:b0:2f1:e351:abcf with SMTP id hh2-20020a05622a618200b002f1e351abcfmr8548180qtb.321.1650323886785; Mon, 18 Apr 2022 16:18:06 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id a1-20020a05622a02c100b002f17cba4930sm8214048qtx.85.2022.04.18.16.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 16:18:06 -0700 (PDT) From: Grant Grundler To: Igor Russkikh Cc: Jakub Kicinski , Paolo Abeni , netdev , "David S . Miller" , LKML , Aashay Shringarpure , Yi Chou , Shervin Oloumi , Grant Grundler Subject: [PATCH 3/5] net: atlantic: reduce scope of is_rsc_complete Date: Mon, 18 Apr 2022 16:17:44 -0700 Message-Id: <20220418231746.2464800-4-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog In-Reply-To: <20220418231746.2464800-1-grundler@chromium.org> References: <20220418231746.2464800-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Don't defer handling the err case outside the loop. That's pointless. And since is_rsc_complete is only used inside this loop, declare it inside the loop to reduce it's scope. Signed-off-by: Grant Grundler --- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net= /ethernet/aquantia/atlantic/aq_ring.c index 440423b0e8ea..bc1952131799 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -346,7 +346,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self, int budget) { struct net_device *ndev =3D aq_nic_get_ndev(self->aq_nic); - bool is_rsc_completed =3D true; int err =3D 0; =20 for (; (self->sw_head !=3D self->hw_head) && budget; @@ -366,6 +365,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, if (!buff->is_eop) { buff_ =3D buff; do { + bool is_rsc_completed =3D true; + if (buff_->next >=3D self->size) { err =3D -EIO; goto err_exit; @@ -377,18 +378,16 @@ int aq_ring_rx_clean(struct aq_ring_s *self, next_, self->hw_head); =20 - if (unlikely(!is_rsc_completed)) - break; + if (unlikely(!is_rsc_completed)) { + err =3D 0; + goto err_exit; + } =20 buff->is_error |=3D buff_->is_error; buff->is_cso_err |=3D buff_->is_cso_err; =20 } while (!buff_->is_eop); =20 - if (!is_rsc_completed) { - err =3D 0; - goto err_exit; - } if (buff->is_error || (buff->is_lro && buff->is_cso_err)) { buff_ =3D buff; --=20 2.36.0.rc0.470.gd361397f0d-goog From nobody Mon May 11 02:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A4C4C433F5 for ; Mon, 18 Apr 2022 23:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234886AbiDRXUy (ORCPT ); Mon, 18 Apr 2022 19:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234776AbiDRXUt (ORCPT ); Mon, 18 Apr 2022 19:20:49 -0400 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08FE923BFE for ; Mon, 18 Apr 2022 16:18:09 -0700 (PDT) Received: by mail-qt1-x833.google.com with SMTP id f22so1913488qtp.13 for ; Mon, 18 Apr 2022 16:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NlRd4j5md/1GciWxxdILk90+l0dQrFXO0akgvKuGKys=; b=hOG03vLUq3iZ50ueHjZVfyhoguvGmU1Wah3UxbLvRBUMDP7zKkkkBuYjd7CwcdDpmd wvvPtX/TM+hZxbHCcAAw7kNp7MW8z7+1X6+Xn1Ap+JnbWmme+Uhk6SUloc93MCqSiBSy dPQSoaoWybf/RQ5HVgmoPZD+Gdyrau6flv0MU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NlRd4j5md/1GciWxxdILk90+l0dQrFXO0akgvKuGKys=; b=Aa2S6gImFyYhkzU2Yev1LxwAgGgaag/wXBtrEeZ1VRhVJ/Y1+fsgLFiBTXlHFspyQ6 ANTRoQSqM9R8Nn9diNQGxSQK/LSFovUF0Zkl0mnGD0uZT+CSkivpPNu3ODpIMgF8HaUr XaC5Cbv0yc81uNZzwty3kxswUzQj/JtvblC74Dcz3qjjuqCx5akMNnHqLFSNV6fs/CrO VS82VX7a9zrSkC+f2gnXPXUN/coNWRkBwBBmeKXOullDT4lZZBC0/m79/aZD8GErXlBW Rs/9mmuxZgMaTYjS5Qj1GstWqN2mRhNv1D1j5yOWcTOzetwuOn8XGSv+eu8bFtUd24NQ TkbQ== X-Gm-Message-State: AOAM5316P6g+TEzUjJXA/BH3mG5iGzGgZ0K+af/9yyWSbzJ4Yr1CNvG7 /6NX5Oxeg51/Ffxo8sKf8cgGVQ== X-Google-Smtp-Source: ABdhPJz4CCSb9zYc5fCCMVLbVMjPO5dyAl5MissvY4yDiiQdYIkuU7OrNjGBrPyf5pI+AKWPBQ6/zw== X-Received: by 2002:a05:622a:40f:b0:2f1:f97b:7519 with SMTP id n15-20020a05622a040f00b002f1f97b7519mr6638240qtx.391.1650323888201; Mon, 18 Apr 2022 16:18:08 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id a1-20020a05622a02c100b002f17cba4930sm8214048qtx.85.2022.04.18.16.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 16:18:07 -0700 (PDT) From: Grant Grundler To: Igor Russkikh Cc: Jakub Kicinski , Paolo Abeni , netdev , "David S . Miller" , LKML , Aashay Shringarpure , Yi Chou , Shervin Oloumi , Grant Grundler Subject: [PATCH 4/5] net: atlantic: add check for MAX_SKB_FRAGS Date: Mon, 18 Apr 2022 16:17:45 -0700 Message-Id: <20220418231746.2464800-5-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog In-Reply-To: <20220418231746.2464800-1-grundler@chromium.org> References: <20220418231746.2464800-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Enforce that the CPU can not get stuck in an infinite loop. Reported-by: Aashay Shringarpure Reported-by: Yi Chou Reported-by: Shervin Oloumi Signed-off-by: Grant Grundler --- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net= /ethernet/aquantia/atlantic/aq_ring.c index bc1952131799..8201ce7adb77 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c @@ -363,6 +363,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, continue; =20 if (!buff->is_eop) { + unsigned int frag_cnt =3D 0U; buff_ =3D buff; do { bool is_rsc_completed =3D true; @@ -371,6 +372,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, err =3D -EIO; goto err_exit; } + + frag_cnt++; next_ =3D buff_->next, buff_ =3D &self->buff_ring[next_]; is_rsc_completed =3D @@ -378,7 +381,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self, next_, self->hw_head); =20 - if (unlikely(!is_rsc_completed)) { + if (unlikely(!is_rsc_completed) || + frag_cnt > MAX_SKB_FRAGS) { err =3D 0; goto err_exit; } --=20 2.36.0.rc0.470.gd361397f0d-goog From nobody Mon May 11 02:06:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4D83C433FE for ; Mon, 18 Apr 2022 23:18:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234825AbiDRXVF (ORCPT ); Mon, 18 Apr 2022 19:21:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234766AbiDRXUu (ORCPT ); Mon, 18 Apr 2022 19:20:50 -0400 Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 725A723BDF for ; Mon, 18 Apr 2022 16:18:10 -0700 (PDT) Received: by mail-qt1-x82b.google.com with SMTP id f14so2630180qtq.1 for ; Mon, 18 Apr 2022 16:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0dcJHoI59iupk/XZrTeiSOhbOxLwLKCBzj4Z2fI2tTc=; b=LhCy4Xw3XN068oiUmiq1/1Q8uv7ZgPx8f0g98Osy317QhjxRDf3CkOOZPc1ftvYJnJ gxOnCH8bESAgzEqHoyAL70WuiVudZ2fj2ItxFXVGHqPNIU0Hj+kI/gpT7q3dnW+7t9YN ffDvkK5FKc6Flz2lKRs5lZvpB7Mi0a3S+yVSA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0dcJHoI59iupk/XZrTeiSOhbOxLwLKCBzj4Z2fI2tTc=; b=0Yj2yTokhygUgy8FqlQjzc3FkklROLTHy329MDrmZ20DEPWL81CnEM6wbJ/5yRTiA5 u0kLuWcgxwzz7bb2rujErK4w7ziCMYicBu/qoo3F+QDJn1gDntEA24WaEM8+s+1gHQ3V pJ64sFZpTR4x/SZ8susdIqSTee+XCZV0hgLu4Or11X64DJj62/R/7yB5A/dRgWuy8RWy 6ClQ78y0vU2NyujyDiWggZoAnma7LjL3fYDmOrqvVGXHJLE3AG0yVoieaIDwoN/T8s7i wnYIxIt5h74Kj3XPdumcDFiCRZGP1uRkg7elFVu/MJaYyaEec5KfucALzPWya3u4g1Ur bcoA== X-Gm-Message-State: AOAM532I8Fd6Ze6+bvkUN27MCe+FNzASoU0uJ29kDZ9kkuSBpZXB+nJG PMLTzs6NPq5CsA2z66N+1g9RDw== X-Google-Smtp-Source: ABdhPJzVmagn0Rfc5cXZudhsLyucFUBeBfCKmqRoxtX4m60vigQt1WYkqD8XBGNWp/r7n0HZ6vDLmg== X-Received: by 2002:ac8:5206:0:b0:2f1:e8cc:7800 with SMTP id r6-20020ac85206000000b002f1e8cc7800mr8620403qtn.501.1650323889668; Mon, 18 Apr 2022 16:18:09 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id a1-20020a05622a02c100b002f17cba4930sm8214048qtx.85.2022.04.18.16.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 16:18:09 -0700 (PDT) From: Grant Grundler To: Igor Russkikh Cc: Jakub Kicinski , Paolo Abeni , netdev , "David S . Miller" , LKML , Aashay Shringarpure , Yi Chou , Shervin Oloumi , Grant Grundler Subject: [PATCH 5/5] net: atlantic: verify hw_head_ is reasonable Date: Mon, 18 Apr 2022 16:17:46 -0700 Message-Id: <20220418231746.2464800-6-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog In-Reply-To: <20220418231746.2464800-1-grundler@chromium.org> References: <20220418231746.2464800-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Bounds check hw_head index to verify it lies within the TX buffer ring. Unexpected values of hw_head may cause aq_ring_tx_clean to double dev_kfree_skb_any already cleaned parts of the ring. Reported-by: Aashay Shringarpure Reported-by: Yi Chou Reported-by: Shervin Oloumi Signed-off-by: Grant Grundler --- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/dr= ivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index e72b9d86f6ad..9b6b93bb3e86 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -889,6 +889,27 @@ int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *s= elf, err =3D -ENXIO; goto err_exit; } + + /* Validate that the new hw_head_ is reasonable. */ + if (hw_head_ >=3D ring->size) { + err =3D -ENXIO; + goto err_exit; + } + + if (ring->sw_head >=3D ring->sw_tail) { + /* Head index hasn't wrapped around to below tail index. */ + if (hw_head_ < ring->sw_head && hw_head_ >=3D ring->sw_tail) { + err =3D -ENXIO; + goto err_exit; + } + } else { + /* Head index has wrapped around and is below tail index. */ + if (hw_head_ < ring->sw_head || hw_head_ >=3D ring->sw_tail) { + err =3D -ENXIO; + goto err_exit; + } + } + ring->hw_head =3D hw_head_; err =3D aq_hw_err_from_flags(self); =20 --=20 2.36.0.rc0.470.gd361397f0d-goog