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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 17AEEC76186 for ; Wed, 24 Jul 2019 19:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D271122AEC for ; Wed, 24 Jul 2019 19:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997605; bh=L2lOm5Rni18yK6PKzNIl2jF5hHRrKSkT9xmNvGKvhE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RIzmtBMtEDbf1m1/fRYoJPYLgaBAhfqkhAaR2XNqUKupZujrH8V5Oe0ZHer9Q3tnL /Z4G1fEs9pCLy+08qa/LtoPDFW2dyqzqjnVa0nYzqyAw21WVg8qo9bawdYr/G7E/SD kerGaaugity1k+UE0QcqcLbJN9P0l9UFhsb2Gxxo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391124AbfGXTqo (ORCPT ); Wed, 24 Jul 2019 15:46:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:52684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391120AbfGXTqo (ORCPT ); Wed, 24 Jul 2019 15:46:44 -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 61A7222ADA; Wed, 24 Jul 2019 19:46:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997603; bh=L2lOm5Rni18yK6PKzNIl2jF5hHRrKSkT9xmNvGKvhE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XankJw0DQWvwdeYUkieEr2UOhRELXdmq1ZqJXispQoEXn2BowUItZJjg/06xUdOb8 gE1/8fUbVl2nnpY4T0eAXV+bA23bhgGlwHqzknbvbyxFn95WpTlTBhv6ZBlb+B7j5y YQijpTBvAfFu+JEMTw3qOyPA5q9iDA3/kuWIghxA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+4f0529365f7f2208d9f0@syzkaller.appspotmail.com, Jeremy Sowden , Steffen Klassert , Sasha Levin Subject: [PATCH 5.1 039/371] af_key: fix leaks in key_pol_get_resp and dump_sp. Date: Wed, 24 Jul 2019 21:16:31 +0200 Message-Id: <20190724191727.481281165@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@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 [ Upstream commit 7c80eb1c7e2b8420477fbc998971d62a648035d9 ] In both functions, if pfkey_xfrm_policy2msg failed we leaked the newly allocated sk_buff. Free it on error. Fixes: 55569ce256ce ("Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.") Reported-by: syzbot+4f0529365f7f2208d9f0@syzkaller.appspotmail.com Signed-off-by: Jeremy Sowden Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/key/af_key.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 4af1e1d60b9f..51c0f10bb131 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -2442,8 +2442,10 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, const struc goto out; } err = pfkey_xfrm_policy2msg(out_skb, xp, dir); - if (err < 0) + if (err < 0) { + kfree_skb(out_skb); goto out; + } out_hdr = (struct sadb_msg *) out_skb->data; out_hdr->sadb_msg_version = hdr->sadb_msg_version; @@ -2694,8 +2696,10 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr) return PTR_ERR(out_skb); err = pfkey_xfrm_policy2msg(out_skb, xp, dir); - if (err < 0) + if (err < 0) { + kfree_skb(out_skb); return err; + } out_hdr = (struct sadb_msg *) out_skb->data; out_hdr->sadb_msg_version = pfk->dump.msg_version; -- 2.20.1