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=-6.8 required=3.0 tests=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 8B10CC7618B for ; Fri, 26 Jul 2019 15:26:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 653B522BF5 for ; Fri, 26 Jul 2019 15:26:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154811; bh=4H05V33b22NBKbavxlsFHLdxSESXPpMrppj84sOSSIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n2W6EbzM5z7b4LwanMrABo0RmNk0N3B+ikH8w9eXlEQlml369ZIsXc17vCr9A8tbn esBAiSBl6dg2feMZWuzasCS6NBCjPdoY+uYpIdq8nycavVBPz0Da40vVzmRcsMEVNC EALpmT8/cvnL3+lpp7bu/pbqbX59eDfJdbxHGXqU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388091AbfGZP0u (ORCPT ); Fri, 26 Jul 2019 11:26:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:40860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388078AbfGZP0s (ORCPT ); Fri, 26 Jul 2019 11:26:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 AFEC1205F4; Fri, 26 Jul 2019 15:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564154808; bh=4H05V33b22NBKbavxlsFHLdxSESXPpMrppj84sOSSIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JttS7iN/3DR8oeV+HPWZKDFkLmYWAdQE+w7p0ce5SctmQF67HUd/aMVC/7LctgHdv 4cRDv21Pq1SHl/HSharB/jKYvkvoOTsOr9pw2KLmWeOfcwhte+iR5+JriUnWomqoFZ /lPK+xx+cQW4ib/zLoGvyRG1t6HJ4yo/qca8AXOc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Steinmetz , Willem de Bruijn , "David S. Miller" Subject: [PATCH 5.2 32/66] macsec: fix use-after-free of skb during RX Date: Fri, 26 Jul 2019 17:24:31 +0200 Message-Id: <20190726152305.366115983@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190726152301.936055394@linuxfoundation.org> References: <20190726152301.936055394@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Steinmetz [ Upstream commit 095c02da80a41cf6d311c504d8955d6d1c2add10 ] Fix use-after-free of skb when rx_handler returns RX_HANDLER_PASS. Signed-off-by: Andreas Steinmetz Acked-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1099,10 +1099,9 @@ static rx_handler_result_t macsec_handle } skb = skb_unshare(skb, GFP_ATOMIC); - if (!skb) { - *pskb = NULL; + *pskb = skb; + if (!skb) return RX_HANDLER_CONSUMED; - } pulled_sci = pskb_may_pull(skb, macsec_extra_len(true)); if (!pulled_sci) {