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=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 EED60C76186 for ; Wed, 24 Jul 2019 20:34:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C528221734 for ; Wed, 24 Jul 2019 20:34:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564000458; bh=gnOSOLYEj45vkm7VxpJ725rQmdijs34Mxubc2vn+YD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ObeW89hWCWu8W8m4542cs9sE1mbXVw+K4SQKIL3w+iQxRjK/kMhGAV1P/iKFG456S Bavz9kbiaCsWNDFJp26XHbS8ctUauiZtpZF16mIMfU9J+GK/5ToVX8ZpY4tSiVEzKH iWX0gb8is50H9G+0/dtAFl2aj0XlgHmjZUNSeYdA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387755AbfGXUeH (ORCPT ); Wed, 24 Jul 2019 16:34:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:44716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728546AbfGXT1M (ORCPT ); Wed, 24 Jul 2019 15:27:12 -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 2D76620659; Wed, 24 Jul 2019 19:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563996431; bh=gnOSOLYEj45vkm7VxpJ725rQmdijs34Mxubc2vn+YD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HlyUrXvF0kRvt6IDPnb9ZeF3JJLeYR3Ztb6c+iYfegPpDeVi2McMuT1c6qUpGOPRY D553UKUQ6dBAcqa+OPc64u+8lkY9cwwJGsF5sFfIdDFHY9E2g55pfp0NAtKwRTDZw4 Yyh+A//+z3pmw59c+DHqsyg+NJwhUZ5pjULfgLcM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Jozsef Kadlecsik , Sasha Levin Subject: [PATCH 5.2 077/413] netfilter: ipset: fix a missing check of nla_parse Date: Wed, 24 Jul 2019 21:16:08 +0200 Message-Id: <20190724191740.609212216@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@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 f4f5748bfec94cf418e49bf05f0c81a1b9ebc950 ] When nla_parse fails, we should not use the results (the first argument). The fix checks if it fails, and if so, returns its error code upstream. Signed-off-by: Aditya Pakki Signed-off-by: Jozsef Kadlecsik Signed-off-by: Sasha Levin --- net/netfilter/ipset/ip_set_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 3cdf171cd468..16afa0df4004 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1541,10 +1541,14 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set, memcpy(&errmsg->msg, nlh, nlh->nlmsg_len); cmdattr = (void *)&errmsg->msg + min_len; - nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr, - nlh->nlmsg_len - min_len, - ip_set_adt_policy, NULL); + ret = nla_parse_deprecated(cda, IPSET_ATTR_CMD_MAX, cmdattr, + nlh->nlmsg_len - min_len, + ip_set_adt_policy, NULL); + if (ret) { + nlmsg_free(skb2); + return ret; + } errline = nla_data(cda[IPSET_ATTR_LINENO]); *errline = lineno; -- 2.20.1