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=-8.2 required=3.0 tests=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_SANE_1 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 3920BC4360C for ; Thu, 10 Oct 2019 09:32:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12B41218AC for ; Thu, 10 Oct 2019 09:31:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="02o6A4zX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388014AbfJJJb4 (ORCPT ); Thu, 10 Oct 2019 05:31:56 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43079 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727683AbfJJJb4 (ORCPT ); Thu, 10 Oct 2019 05:31:56 -0400 Received: by mail-wr1-f66.google.com with SMTP id j18so6952048wrq.10 for ; Thu, 10 Oct 2019 02:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=MyHkItq+3f5f6XhOQmBQDuPqwsiCso3hU6AV8azXpM4=; b=02o6A4zXXVQPLJFPGLnJEDV3VsW1W70MzX6dlz1pjQ+Qb2wdhVDMnYSMobJxi8LnuV a5uPRcWzXinFQkKps6GqXd4Jt6NyWP5StYYkL9H33r1eVc3Iq6f9d9sYkiJk6i6XUznC OvHLaOB+G1ejSBcyaydjAKIWezdy1kcvs3rcQwXJzNl1WrS1Yd1RAHLSRbm3OqkbRwCX UbZ8V2bPp0tSSUUl+74AiD1avzMcuhbQTwbUh09pA4i/+iBIvASw0mDLPFZ01sSVswzl K+vnfirFrR5wAkpky47pnUgiopTBOIg9lENMAeM45E/g33umdHE/YFHRA5yY+l0ZAyiA Mttw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=MyHkItq+3f5f6XhOQmBQDuPqwsiCso3hU6AV8azXpM4=; b=PP3IuXpZeHj668dAtVWkkEArQCFfZiGwmQl2kB59fm90b8QWv3GHdfRQQBkGuu+1ob w+ym8mMDPpl5RwsXqt/by0Mdm7cG+NhCCBFU/DXOrWeRi548HDGpOEPdCkLJ/Fw4EoBX LZBHEzyWmgwbGhOw2a3dRXeixdmY2KoNoFImWDIyu7LepgOnNIQAzrCYzcOiFLAlkl2o PoIdmWtXOy9qWMuuieyFdP225f0Q2LWSKygf3wA8lG7NMgMAPpaivhOG8BauNA9o1IoW JXd4Lb0V4duW3Nqd+NSgNdx37JK6uWu9YcFot8BS7i0BiHomBpD3dFODH4Mqob6nHWxj ykvg== X-Gm-Message-State: APjAAAX4cTSaYUyKQ5KZCyFhP1fULb9CVC3hRRSibklXkZAU8gmVOfDt dn8WhhT2j0VRd9viTJe1rDfNqw== X-Google-Smtp-Source: APXvYqyJMVy8NWJi3linHyfYh4c37lJsuAOqVBceajAGlAq6CFQgyZVlDa7J0Y8TEd1uLefC1Trv/g== X-Received: by 2002:adf:f50b:: with SMTP id q11mr4045559wro.310.1570699914005; Thu, 10 Oct 2019 02:31:54 -0700 (PDT) Received: from localhost ([85.163.43.78]) by smtp.gmail.com with ESMTPSA id l13sm5415316wmj.25.2019.10.10.02.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 02:31:53 -0700 (PDT) Date: Thu, 10 Oct 2019 11:31:53 +0200 From: Jiri Pirko To: Michal Kubecek Cc: "David S. Miller" , Jiri Pirko , Johannes Berg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] genetlink: do not parse attributes for families with zero maxattr Message-ID: <20191010093153.GG2223@nanopsycho> References: <20191009164432.AD5D1E3785@unicorn.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191009164432.AD5D1E3785@unicorn.suse.cz> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wed, Oct 09, 2019 at 06:44:32PM CEST, mkubecek@suse.cz wrote: >Commit c10e6cf85e7d ("net: genetlink: push attrbuf allocation and parsing >to a separate function") moved attribute buffer allocation and attribute >parsing from genl_family_rcv_msg_doit() into a separate function >genl_family_rcv_msg_attrs_parse() which, unlike the previous code, calls >__nlmsg_parse() even if family->maxattr is 0 (i.e. the family does its own >parsing). The parser error is ignored and does not propagate out of >genl_family_rcv_msg_attrs_parse() but an error message ("Unknown attribute >type") is set in extack and if further processing generates no error or >warning, it stays there and is interpreted as a warning by userspace. > >Dumpit requests are not affected as genl_family_rcv_msg_dumpit() bypasses >the call of genl_family_rcv_msg_doit() if family->maxattr is zero. Do the >same also in genl_family_rcv_msg_doit(). > >Fixes: c10e6cf85e7d ("net: genetlink: push attrbuf allocation and parsing to a separate function") >Signed-off-by: Michal Kubecek >--- > net/netlink/genetlink.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > >diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c >index ecc2bd3e73e4..c4bf8830eedf 100644 >--- a/net/netlink/genetlink.c >+++ b/net/netlink/genetlink.c >@@ -639,21 +639,23 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family, > const struct genl_ops *ops, > int hdrlen, struct net *net) > { >- struct nlattr **attrbuf; >+ struct nlattr **attrbuf = NULL; > struct genl_info info; > int err; > > if (!ops->doit) > return -EOPNOTSUPP; > >+ if (!family->maxattr) >+ goto no_attrs; > attrbuf = genl_family_rcv_msg_attrs_parse(family, nlh, extack, > ops, hdrlen, > GENL_DONT_VALIDATE_STRICT, >- family->maxattr && > family->parallel_ops); Please also adjust genl_family_rcv_msg_attrs_free() call arg below in this function in the similar way. > if (IS_ERR(attrbuf)) > return PTR_ERR(attrbuf); > >+no_attrs: > info.snd_seq = nlh->nlmsg_seq; > info.snd_portid = NETLINK_CB(skb).portid; > info.nlhdr = nlh; >-- >2.23.0 >