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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 C9212C433E7 for ; Mon, 12 Oct 2020 13:35:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83C0221D81 for ; Mon, 12 Oct 2020 13:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509706; bh=Ytcri4kG4M2XhCPYKUnH3cSUlS2ZgeqpgD1d7g2OaPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c4ssh2x3JjEwADQ1FRgNqZm6H4kF54sDC7JnHLWNDqgjDK+RlKEwVH6mu3NE4iCaC 2uiQjQJn4HqpUHZPf54RmVKrXOSaoSzRZ372JWi5f5g2N1Zy+xt+tFXXojvl6o5vJA 3YAsyKeIlJK1Qx+kTUehiLcCYVNYNWA5C+KIkqFs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730766AbgJLNfF (ORCPT ); Mon, 12 Oct 2020 09:35:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:37052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730273AbgJLNed (ORCPT ); Mon, 12 Oct 2020 09:34:33 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 428F22074F; Mon, 12 Oct 2020 13:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509672; bh=Ytcri4kG4M2XhCPYKUnH3cSUlS2ZgeqpgD1d7g2OaPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YkXqJ4COL9sCZcsuz3TKR8iXZS6uVWMZ8Wu8DOdp0vWQKoNzTExDor98GxvvSD1xP nM7cp9o24OL5BK1KB5rth6jqnFONunba12o1AcFIC1eja0htJ7Cyz6Z5AhY6crtfLy glCWjt16IYpcLdEfaL05oI9HUMFfZUPrN6/ipJc8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Paolo Abeni , Jakub Kicinski Subject: [PATCH 4.9 35/54] macsec: avoid use-after-free in macsec_handle_frame() Date: Mon, 12 Oct 2020 15:26:57 +0200 Message-Id: <20201012132631.214913922@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.585664421@linuxfoundation.org> References: <20201012132629.585664421@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet commit c7cc9200e9b4a2ac172e990ef1975cd42975dad6 upstream. De-referencing skb after call to gro_cells_receive() is not allowed. We need to fetch skb->len earlier. Fixes: 5491e7c6b1a9 ("macsec: enable GRO and RPS on macsec devices") Signed-off-by: Eric Dumazet Cc: Paolo Abeni Acked-by: Paolo Abeni Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1087,6 +1087,7 @@ static rx_handler_result_t macsec_handle struct macsec_rx_sa *rx_sa; struct macsec_rxh_data *rxd; struct macsec_dev *macsec; + unsigned int len; sci_t sci; u32 pn; bool cbit; @@ -1242,9 +1243,10 @@ deliver: macsec_rxsc_put(rx_sc); skb_orphan(skb); + len = skb->len; ret = gro_cells_receive(&macsec->gro_cells, skb); if (ret == NET_RX_SUCCESS) - count_rx(dev, skb->len); + count_rx(dev, len); else macsec->secy.netdev->stats.rx_dropped++;