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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 433DBC6786C for ; Fri, 14 Dec 2018 12:13:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED7D62133F for ; Fri, 14 Dec 2018 12:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789595; bh=l2YZoosmLQmgUuU9pvt8NvZMwIFCjsMpGiMr+kEUU0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NAcDxbklgWKzntjBP3NDXCbXSEIp0eKLMAPwzSXu3v/LvipfJ1fhSIAasVOKs0fBe rL2fCU3ICDSghImW48GTDATq31YHhlA6NHIFehbhwy8lrmx0d4QcZBYzMRzE3lWAcc hIgNxvfzaNUyffh37azgj7I+pcONfLfvwXdP+rjc= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED7D62133F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732090AbeLNMNN (ORCPT ); Fri, 14 Dec 2018 07:13:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:60658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731851AbeLNMNL (ORCPT ); Fri, 14 Dec 2018 07:13:11 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 D3C2420892; Fri, 14 Dec 2018 12:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789590; bh=l2YZoosmLQmgUuU9pvt8NvZMwIFCjsMpGiMr+kEUU0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ObqcLZ3QYd+M4OLhskWQCCkCIvE4Cjr69P1/FCNBJvR4aG5y+8fBOR1EVS/nwVGex 51h2OymLK+pZ6m5d78VegZZLy2mG7x9qehdK2jujFVgcgDjfRmE1ikToAoIeUMBYrG oK4pi7VeIvQSxuKxkMa0BTvNjbpYDl4qj3Q4o0WI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 40/51] net: hisilicon: remove unexpected free_netdev Date: Fri, 14 Dec 2018 13:00:42 +0100 Message-Id: <20181214115716.728155015@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115713.244259772@linuxfoundation.org> References: <20181214115713.244259772@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c758940158bf29fe14e9d0f89d5848f227b48134 ] The net device ndev is freed via free_netdev when failing to register the device. The control flow then jumps to the error handling code block. ndev is used and freed again. Resulting in a use-after-free bug. Signed-off-by: Pan Bian Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index 39778892b3b3..b5d18d95d7b9 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -922,10 +922,8 @@ static int hip04_mac_probe(struct platform_device *pdev) } ret = register_netdev(ndev); - if (ret) { - free_netdev(ndev); + if (ret) goto alloc_fail; - } return 0; -- 2.19.1