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=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 225DDC43387 for ; Mon, 7 Jan 2019 13:05:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7B8F217D4 for ; Mon, 7 Jan 2019 13:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866339; bh=J5wwWkYINFrz0MufIa2xUbDPawq4m33S1IZ6J9pTGK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vsbxral1lYKTwPX+I18R6hYyy5fSUf5cbZTsMTflIyLCAw2NnUzzIV/1jlwQzg6I7 VktxGvDDLjJ0KbvNL5jWqElUotTnFEuGmXnDP4FM5K3E3PoHy5YAA5obgXnKk5G74q ddYdlX4luI+NAeijC9sI3VoXJy6z2AnE9tZIW+y0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729758AbfAGNFc (ORCPT ); Mon, 7 Jan 2019 08:05:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:53246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727994AbfAGNFc (ORCPT ); Mon, 7 Jan 2019 08:05:32 -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 C318B21736; Mon, 7 Jan 2019 13:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866332; bh=J5wwWkYINFrz0MufIa2xUbDPawq4m33S1IZ6J9pTGK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fF7PmDZ3nsU5488Cu+ywc/gaUKMljkEvBD2p7E+REX7YTuT9TfZhGh/+DqI4jE7V2 gNfyBsU4+TUf8+aOpcPYgIPu/8XhQ3koNbT3K7o7oZK6c99y++GMlYqI1BR+xhafMr 3NlCoVmEZFGYht4hlwGNDkWVHIxmU+mZxEivPykU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ying Xue , Jon Maloy , Cong Wang , "David S. Miller" , syzbot+eae585ba2cc2752d3704@syzkaller.appspotmail.com Subject: [PATCH 4.9 19/71] tipc: fix a double kfree_skb() Date: Mon, 7 Jan 2019 13:32:48 +0100 Message-Id: <20190107105333.690200243@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107105330.280153213@linuxfoundation.org> References: <20190107105330.280153213@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cong Wang [ Upstream commit acb4a33e9856d5fa3384b87d3d8369229be06d31 ] tipc_udp_xmit() drops the packet on error, there is no need to drop it again. Fixes: ef20cd4dd163 ("tipc: introduce UDP replicast") Reported-and-tested-by: syzbot+eae585ba2cc2752d3704@syzkaller.appspotmail.com Cc: Ying Xue Cc: Jon Maloy Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/tipc/udp_media.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -243,10 +243,8 @@ static int tipc_udp_send_msg(struct net } err = tipc_udp_xmit(net, _skb, ub, src, &rcast->addr); - if (err) { - kfree_skb(_skb); + if (err) goto out; - } } err = 0; out: