From patchwork Mon Oct 12 13:27:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 270364 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,URIBL_BLOCKED,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 4263EC433DF for ; Mon, 12 Oct 2020 13:39:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E63622076E for ; Mon, 12 Oct 2020 13:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509941; bh=2UScKxsKiQ4yW6zBcZG68y9/Sr72p5mYnaR5HyUBc8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=P+uLeuUjCTwuVDFC/qJRbpjJjwsyZeY/HbjgNz1GHMQuNySfdxQgK39NsMU8CktVe d6HTqbEH9D9Ez8tV404v5Q8JW65tVFcStFgLS/uG/agkK17j7YsnaaeA/DsF7qMYJd /IXkWCPGh/P9jK0GD9P+FHzQ43pfLANA0YIjemkE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729782AbgJLNjA (ORCPT ); Mon, 12 Oct 2020 09:39:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:42386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730291AbgJLNir (ORCPT ); Mon, 12 Oct 2020 09:38:47 -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 E252E20678; Mon, 12 Oct 2020 13:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509926; bh=2UScKxsKiQ4yW6zBcZG68y9/Sr72p5mYnaR5HyUBc8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J2HwSzK0fQYeURVkjOL0k6BdZr/fEt7q7zFX4EUWdQ74vX+LhqxGvVjOMGA0u+n1a 8x+Iz7Bm/x00HakU/mvitu4pHf0K5qoyskcWJwChWY+Ahi0lBJmzsiKUJe35pAfOm6 g/7MnqSNt/UTcHbKQ4wY+JYCyguv+hUm7j1FmFnA= 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.19 18/49] macsec: avoid use-after-free in macsec_handle_frame() Date: Mon, 12 Oct 2020 15:27:04 +0200 Message-Id: <20201012132630.290423413@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.469542486@linuxfoundation.org> References: <20201012132629.469542486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -1085,6 +1085,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; @@ -1240,9 +1241,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++;