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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 DB3BDC33CAF for ; Thu, 16 Jan 2020 17:54:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A210924681 for ; Thu, 16 Jan 2020 17:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579197299; bh=8CbT8TZ2iRcbrH7EgaNzFCMgeHLem/RyTXHo5n0sxLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yS3allBJ8lOQ8IVF52xbWf6JkhYbNxbMSvwPb211gVhne95TvX04XV1usGpvULdwy /ip5S64IR90U5KRlfIQ+1KNvCxhd7yEJYey3wDMvOx9fgMBUkAfiEK/bDadqM1X2yQ KWCpoyQOpe15CVmqKARyiJqgOOfibaKj3Xa3jPko= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406439AbgAPRy6 (ORCPT ); Thu, 16 Jan 2020 12:54:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:35466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394170AbgAPRo2 (ORCPT ); Thu, 16 Jan 2020 12:44:28 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EC9E324763; Thu, 16 Jan 2020 17:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196667; bh=8CbT8TZ2iRcbrH7EgaNzFCMgeHLem/RyTXHo5n0sxLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NJUy4MaPZ3F8kQQaYyqD5XRnb/j8BUwHSF1cbWWnCCNvqTAp1vnAGsJ7n4BQIfHUt S5e/JzOZRt+OwXvvh6gTJGP5XFxNSYtcmRVB9jzkUEdfpBy7GQzW3MkYyXO+6RUJ7X XKCIVai3yGFLnnj4FrpTHBqgscjhamRSOoYQ5ahU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YueHaibing , Hulk Robot , Mukesh Ojha , "David S . Miller" , Sasha Levin , dccp@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 069/174] dccp: Fix memleak in __feat_register_sp Date: Thu, 16 Jan 2020 12:41:06 -0500 Message-Id: <20200116174251.24326-69-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116174251.24326-1-sashal@kernel.org> References: <20200116174251.24326-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit 1d3ff0950e2b40dc861b1739029649d03f591820 ] If dccp_feat_push_change fails, we forget free the mem which is alloced by kmemdup in dccp_feat_clone_sp_val. Reported-by: Hulk Robot Fixes: e8ef967a54f4 ("dccp: Registration routines for changing feature values") Reviewed-by: Mukesh Ojha Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/dccp/feat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/dccp/feat.c b/net/dccp/feat.c index f227f002c73d..db87d9f58019 100644 --- a/net/dccp/feat.c +++ b/net/dccp/feat.c @@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local, if (dccp_feat_clone_sp_val(&fval, sp_val, sp_len)) return -ENOMEM; - return dccp_feat_push_change(fn, feat, is_local, mandatory, &fval); + if (dccp_feat_push_change(fn, feat, is_local, mandatory, &fval)) { + kfree(fval.sp.vec); + return -ENOMEM; + } + + return 0; } /** -- 2.20.1