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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 69EC9C43387 for ; Thu, 10 Jan 2019 08:54:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BE9C20879 for ; Thu, 10 Jan 2019 08:54:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727685AbfAJIyM (ORCPT ); Thu, 10 Jan 2019 03:54:12 -0500 Received: from relay.sw.ru ([185.231.240.75]:53434 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727547AbfAJIyM (ORCPT ); Thu, 10 Jan 2019 03:54:12 -0500 Received: from [172.16.25.169] by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1ghW6D-0002nj-Jp; Thu, 10 Jan 2019 11:54:01 +0300 Subject: Re: [PATCH] ipset: fix a missing check of nla_parse To: Pablo Neira Ayuso Cc: Kangjie Lu , pakki001@umn.edu, Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Stefano Brivio , Andrey Ryabinin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20181226035002.73614-1-kjlu@umn.edu> <20190109224335.qe6f4x4722qz6x5p@salvia> From: Kirill Tkhai Message-ID: <298cbd2a-06fd-39c1-7d5f-5adcf21b68b2@virtuozzo.com> Date: Thu, 10 Jan 2019 11:54:01 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 MIME-Version: 1.0 In-Reply-To: <20190109224335.qe6f4x4722qz6x5p@salvia> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10.01.2019 01:43, Pablo Neira Ayuso wrote: > On Wed, Dec 26, 2018 at 12:16:25PM +0300, Kirill Tkhai wrote: >> On 26.12.2018 06:50, Kangjie Lu wrote: >>> 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: Kangjie Lu >>> --- >>> net/netfilter/ipset/ip_set_core.c | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c >>> index 1577f2f76060..4dc8057cff02 100644 >>> --- a/net/netfilter/ipset/ip_set_core.c >>> +++ b/net/netfilter/ipset/ip_set_core.c >>> @@ -1531,8 +1531,10 @@ 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(cda, IPSET_ATTR_CMD_MAX, cmdattr, >>> + ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr, >>> nlh->nlmsg_len - min_len, ip_set_adt_policy, NULL); > > @Kangjie: nitpick, could you align this line below? ie. > > ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, cmdattr, > nlh->nlmsg_len - min_len, ip_set_adt_policy, > NULL); > >>> + if (ret) >>> + return ret; >> >> In this function above nlmsg_new() allocates skb2, but I don't see, where you free it here. > > netlink_unicast() is responsible for releasing this skb2. We return earlier at "if (ret)", so netlink_unicast() is not called. >>> errline = nla_data(cda[IPSET_ATTR_LINENO]); Kirill