From nobody Mon May 11 02:06:51 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 5F3F4C433F5 for ; Tue, 10 May 2022 02:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234756AbiEJCcp (ORCPT ); Mon, 9 May 2022 22:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234689AbiEJCcf (ORCPT ); Mon, 9 May 2022 22:32:35 -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 57D0C1A90D2 for ; Mon, 9 May 2022 19:28:39 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id m1so5091541qkn.10 for ; Mon, 09 May 2022 19:28:39 -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=8rinvUkerUnBV1oCCsJspInjXAj8u20lqkKc2zXtN9k=; b=YSvcgAJmFkKTvstDHxNY7NSKlk4XIGhWHKxe1SPdH1m/1xkfacghSFkGsFBcHkwRN8 Hb8hp1lKChVAL/ja5FTS/V1oCZvrrlRYRO73z3pkrl9jv75dH3p+qn2Vv3DQ/h6TW1Zv LnW8RqqND7Rumoaid9OuYYJIbUfBQIvfPp1Ls= 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=8rinvUkerUnBV1oCCsJspInjXAj8u20lqkKc2zXtN9k=; b=cs0W5ZSn9LgL8SoIOZMlokILcfa6nyd5rnRDvYU08oUoWQMh1sXdDDrITlkMc4tNMl CtoXuPcCZbI5Zb2LOgtOF5sSQzz9N/ufnPCzVRkUul/PjeR+mfdNY51G4Oc1kYBLXp4j uv1rroBeCjbAssHbsB7FTUXOeMiG/4b0mBLcBtZKFlPjrsTGIOqPJJ4BV+bgI79C4iZ3 J/LewlcT1RvV8mg2bQMZOJbib+KpNgtLwXJDtxewV0Ogdz7KL/xluHa6jEomf+PtIEn+ XDB3EMRqSlMp24VcEjyCKDLUe3FC5UEeQQqH+amuz8JgcQRA6UB2cltQzzE1EMHOR3aq 9V6g== X-Gm-Message-State: AOAM531tDn72uXhBPQ6eErBhSX8660+sThlgPAlwsMSJok7ph/wWwsdX iaaM6nKc1qUUw2JZVHrQo/kNbw== X-Google-Smtp-Source: ABdhPJztevCzT89DbElfTEsOF0uoMW79/1vD5zhMlvLX7s2o06sJ/SCCOBfQbN6I0wISEmd3EJHFCw== X-Received: by 2002:a05:620a:4481:b0:6a0:1dd3:d210 with SMTP id x1-20020a05620a448100b006a01dd3d210mr14496664qkp.137.1652149718427; Mon, 09 May 2022 19:28:38 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id 18-20020a05620a06d200b0069fc13ce213sm7742375qky.68.2022.05.09.19.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 19:28:37 -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/4] net: atlantic: fix "frag[0] not initialized" Date: Mon, 9 May 2022 19:28:23 -0700 Message-Id: <20220510022826.2388423-2-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog In-Reply-To: <20220510022826.2388423-1-grundler@chromium.org> References: <20220510022826.2388423-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.512.ge40c2bad7a-goog From nobody Mon May 11 02:06:51 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 E0930C433F5 for ; Tue, 10 May 2022 02:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234742AbiEJCcw (ORCPT ); Mon, 9 May 2022 22:32:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234695AbiEJCcn (ORCPT ); Mon, 9 May 2022 22:32:43 -0400 Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB0801A8E3A for ; Mon, 9 May 2022 19:28:40 -0700 (PDT) Received: by mail-qk1-x72f.google.com with SMTP id a22so12337412qkl.5 for ; Mon, 09 May 2022 19:28:40 -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=bUbzj8GLC4jvUsYc0bHNPk/HK3W9TD3sIIfgXJoJyIY=; b=dKUkWB+BSsBV4LJQJgQQIGHHcr10pdJCgyB/PC3+Cizv5Xr6ZwuJgcoHpdJ2pIR7ca owKpDe8+vRmPfqytZ8SrTCheO3wx3rNEzMuzhhjeDJufu5ljhytYQOPTCL1SqPwOIbNT kAl0rEzPB3Kvxaw3Q0EXAUIly+pN51YVIZ6dI= 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=bUbzj8GLC4jvUsYc0bHNPk/HK3W9TD3sIIfgXJoJyIY=; b=OHJkpXb+RY4At9rf1PYap+dOD3JdpbzdyACsJFQJAqUf765MOtHuAvmHKFiSHhpful QNuYOia4wFhHVtyg2eiWUUSAyad+ExQep5Sr+mvt8LZl2Eu232vaUSWNi1i4Qw2fvhTe QUAxBZIbnATn3DaFbSNV4Bdh8pyhejBnn+f9AlPmOdhCo14/Il1R/GczEmem+qoI3grF M8ZlzuN88X29sE0PpBPVyUFt9hagWQU/3DEYmYSRnxXhN4x40476WRcAich+jybIRAKe JEW4VGT7M7JjnKcpHJp9Q3EH+3b/SlsynotY8ow8GppKEVYey/35e/eAg9a1EOruiK3D smSQ== X-Gm-Message-State: AOAM531zVQNTykc9SmMvfxigndppyhf5nnyxNoKtxVGum5SpVYYsy6E7 cB+moKq8stAVluz2Wmn92Sbqjg== X-Google-Smtp-Source: ABdhPJw8tInFnILG7NEA+kbxqihBOLVsR4MN4pD697DeaRfAj4WTH5Sbi9DVb3wLh49+sUea6CnPaA== X-Received: by 2002:a37:a28d:0:b0:6a0:a446:703b with SMTP id l135-20020a37a28d000000b006a0a446703bmr4661918qke.661.1652149719908; Mon, 09 May 2022 19:28:39 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id 18-20020a05620a06d200b0069fc13ce213sm7742375qky.68.2022.05.09.19.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 19:28:39 -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/4] net: atlantic: reduce scope of is_rsc_complete Date: Mon, 9 May 2022 19:28:24 -0700 Message-Id: <20220510022826.2388423-3-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog In-Reply-To: <20220510022826.2388423-1-grundler@chromium.org> References: <20220510022826.2388423-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.512.ge40c2bad7a-goog From nobody Mon May 11 02:06:51 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 66452C433F5 for ; Tue, 10 May 2022 02:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234764AbiEJCcz (ORCPT ); Mon, 9 May 2022 22:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234705AbiEJCcn (ORCPT ); Mon, 9 May 2022 22:32:43 -0400 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47CCA1B54A0 for ; Mon, 9 May 2022 19:28:42 -0700 (PDT) Received: by mail-qt1-x835.google.com with SMTP id p4so12640010qtq.12 for ; Mon, 09 May 2022 19:28:42 -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=4EWw5JGDEHsMse3xSXgMpkF6wSSyJrohxFDmx4Uh7Y8=; b=SU4uW3pGecsbPcp0Kv09VMxlJlYHU5q6PWtTuzMCPY/ZfhDyY8oc/4TlbA+OEF5Qop jYot5V3KkZDNg0omlWj2/dOPS7t8ORwIXyq08+Vn+1YHQDQ62dCCCm4CwE/bijZofjl3 1mi7+08Gi2drCbHG9Baktf2sAwbolyZMKRCpo= 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=4EWw5JGDEHsMse3xSXgMpkF6wSSyJrohxFDmx4Uh7Y8=; b=8I/lFUyMkpVkrGNrVrs38z+qh8oAivnpe3o2AUk5iGgYAZml5hXihPQ4owcr4l6wq/ SAAr0EOGBb94nYa5pZFO0v7yWQATyxSVQlyzKyjhYaZQzYfqWkf49dOmfu1QTJYslpQ3 JtL9oZBjV3LviGPdxc65GNWwMCQOdKU4ZPBoTurDdb+7StF3DIp3eFla/leqr1jqz79R NL7LKXzxQJ15/TH0ZudrXS7H9eL5sLXTW3+hWkGH5kIHkE3JB484TQcM2WvS0WmtWR0c ntkEG1bBNFrRxQT5r2x7FuBOeAiG3QkG8b6p1JAq/IqEuNlXGYlhnfh6rIlyMnvbKp87 mfbQ== X-Gm-Message-State: AOAM530ubB5EdZHmTGTV12+96Mv7ZYboX9C/7NZr4EdAuu6QQfy0c6HU /AiqItiVbqoFpF8sml9FlCNKJA== X-Google-Smtp-Source: ABdhPJxarJEk/ID5VphXnrFWpgEyqqSeuMq9yhKZqIDkr+eRQakSbG0CkYNJ1HoDIjV6KF5zy6aFmA== X-Received: by 2002:ac8:5e0c:0:b0:2f3:adfd:bd30 with SMTP id h12-20020ac85e0c000000b002f3adfdbd30mr17775658qtx.277.1652149721349; Mon, 09 May 2022 19:28:41 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id 18-20020a05620a06d200b0069fc13ce213sm7742375qky.68.2022.05.09.19.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 19:28:40 -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/4] net: atlantic: add check for MAX_SKB_FRAGS Date: Mon, 9 May 2022 19:28:25 -0700 Message-Id: <20220510022826.2388423-4-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog In-Reply-To: <20220510022826.2388423-1-grundler@chromium.org> References: <20220510022826.2388423-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.512.ge40c2bad7a-goog From nobody Mon May 11 02:06:51 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 59470C433EF for ; Tue, 10 May 2022 02:29:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234706AbiEJCdF (ORCPT ); Mon, 9 May 2022 22:33:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234725AbiEJCcn (ORCPT ); Mon, 9 May 2022 22:32:43 -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 250371B5FA3 for ; Mon, 9 May 2022 19:28:43 -0700 (PDT) Received: by mail-qk1-x730.google.com with SMTP id m1so5091541qkn.10 for ; Mon, 09 May 2022 19:28:42 -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=KR84+H+bN0lQo4wWubc5nvH3kSUJYfq+QmRNV3y6a0k=; b=kg3DV5xvIdwvYnB14NNn+iQhe6oRv5KYGtp/uGfNnwIcUuEQOwRv6v/onYNXQ9Sd2v KdEFfE3V8nwxy/na6sSsFtDkU7IdIw14mjkawCvFJ9xUiYDd68MUKwlKBYL6BY4A7+Gt Sx76KKlsjVvMB1VpPr19zJ86eeXgUdZofordQ= 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=KR84+H+bN0lQo4wWubc5nvH3kSUJYfq+QmRNV3y6a0k=; b=B4fuoIDXh9j36RcJrfcBq8qXvnGIJz4VfjpyRM3ETLNNfwlVKkUhOuleJJcsTOkyyQ 51FY6CN3Ii8EmLWseTRtpBqVaBRYG0CT7UjPsm0IlbqUITWjmNez6ghbrDsdBu4tR/cZ +ZlDKis9+GR7PFWugTaRYXVbjwyduM+QOqwMW+6yeTSFe4MT9J5w1GabME5m7monrs+5 cmEUwp5llyZt20qPp1zot0vW5FcQuRREeaaWg08bMQ7zRCgVELF/E7LlS9EfTFUclRzY i6icPqDan3uTVxzshR7TpammhVqp96FdVRW2xto2dogn6fiKhvKEmMC6rYweaUIiWfXS gF1Q== X-Gm-Message-State: AOAM530Y3LRW5pqQledyduDgbX0lVUbtOc6jAPOiPpwdIrMr2eF4ZB6e QugQ0iZLa0FM/H7LboHRmSvrMg== X-Google-Smtp-Source: ABdhPJzsl0mRS8xiFI417lv8qxMM9KcSjMR34xbPd3Ea7e886h9IDUa9Cnp6DYeSvRK6lpcHhDRbvQ== X-Received: by 2002:a37:745:0:b0:69f:c741:105d with SMTP id 66-20020a370745000000b0069fc741105dmr14074522qkh.774.1652149722733; Mon, 09 May 2022 19:28:42 -0700 (PDT) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id 18-20020a05620a06d200b0069fc13ce213sm7742375qky.68.2022.05.09.19.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 19:28:42 -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/4] net: atlantic: verify hw_head_ lies within TX buffer ring Date: Mon, 9 May 2022 19:28:26 -0700 Message-Id: <20220510022826.2388423-5-grundler@chromium.org> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog In-Reply-To: <20220510022826.2388423-1-grundler@chromium.org> References: <20220510022826.2388423-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 provided by NIC to verify it lies within the TX buffer ring. 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 | 7 +++++++ 1 file changed, 7 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 d875ce3ec759..15ede7285fb5 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,13 @@ 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; + } + ring->hw_head =3D hw_head_; err =3D aq_hw_err_from_flags(self); =20 --=20 2.36.0.512.ge40c2bad7a-goog