Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2103945ybp; Thu, 10 Oct 2019 02:14:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5rITw+qizcfJeikiGm4qWrr6hMEFo2CiEX1iBTc0wvyJ8a81zfnThsauLvVxHKGw/V+ep X-Received: by 2002:a17:906:6011:: with SMTP id o17mr6888158ejj.172.1570698875797; Thu, 10 Oct 2019 02:14:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570698875; cv=none; d=google.com; s=arc-20160816; b=ZGLzPfrOP5QbWPv3H59BMSrHhNHR0Ee6t7/k6N1t31sciJ8w9HhqSSX1zwdio9O+xt 2aQvtKaLW4+rqdd2twlqozBp3MzcJs7lxEPij/zWPRznLTbURKIBU4sKMC4sWhZ9sLqW cQOY0a9D9dt9WYt32BkgUzUa+4cAqprvGNl7QXH+COsQ58Kn1bVb3CMstR12dQixFkaN RSvPDx8REfFiHCYU4TNQtCQw5TSrQtYEysNROC+0UPaQA8pHP8UXODka9jDt3mX8Ce/E uQFLZK3PM3Njmd9TGUrqqj5hACsYuV24P4KIptprhpCkKHcKNmWi+Ctu+vhkDlSz3Bcd 3hJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=6qJu/3f6qUdZHP0yXNM+/NZqstonNusBUUo4VpJWZJ0=; b=RuAmXWFS0vMfwx0fkVcQ/WqfaieGG8bqSAee5VwLxxPIHcZSua4OFa52c0CupTA6Ar RSLtykXc3UVJsg+xMhBrlxC8Mes7nM3KloJn82Ij2e+GWzN+uDhmgJnkjmxZ4QRyvbdl vufHLbAjtzhs1Bu09CbGIxjPAYVO1ByKgBQS9zi/1hh2g2OV4Q5nS2V9sei5Ok+sF+pm HhNPQZo9F4akGzmGbFvuVP72rcTpv0cnEADb2kkW7eWOE8o/NUp+AruEuqRUyYpWMem2 OEmz5Pf4T3hDqkAL49tHuHj6wv2G+VGapaBc2+7qQcoL8TiaJjm1+fZys2WBzFCJqu1B aTDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f33si2748840edb.281.2019.10.10.02.14.12; Thu, 10 Oct 2019 02:14:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387661AbfJJJNu (ORCPT + 99 others); Thu, 10 Oct 2019 05:13:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:43954 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1733250AbfJJJNu (ORCPT ); Thu, 10 Oct 2019 05:13:50 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 9B9B7B061; Thu, 10 Oct 2019 09:13:48 +0000 (UTC) Received: by unicorn.suse.cz (Postfix, from userid 1000) id 34DE4E378C; Thu, 10 Oct 2019 11:13:47 +0200 (CEST) Date: Thu, 10 Oct 2019 11:13:47 +0200 From: Michal Kubecek To: Jiri Pirko 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: <20191010091347.GA22163@unicorn.suse.cz> References: <20191009164432.AD5D1E3785@unicorn.suse.cz> <20191010083958.GD2223@nanopsycho> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191010083958.GD2223@nanopsycho> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 10, 2019 at 10:39:58AM +0200, Jiri Pirko wrote: > 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(). > > This is the original code before the changes: > > if (ops->doit == NULL) > return -EOPNOTSUPP; > > if (family->maxattr && family->parallel_ops) { > attrbuf = kmalloc_array(family->maxattr + 1, > sizeof(struct nlattr *), > GFP_KERNEL); > if (attrbuf == NULL) > return -ENOMEM; > } else > attrbuf = family->attrbuf; > > if (attrbuf) { > enum netlink_validation validate = NL_VALIDATE_STRICT; > > if (ops->validate & GENL_DONT_VALIDATE_STRICT) > validate = NL_VALIDATE_LIBERAL; > > err = __nlmsg_parse(nlh, hdrlen, attrbuf, family->maxattr, > family->policy, validate, extack); > if (err < 0) > goto out; > } > > Looks like the __nlmsg_parse() is called no matter if maxattr if 0 or > not. It is only considered for allocation of attrbuf. This is in-sync > with the current code. If family->maxattr is 0, genl_register_family() sets family->attrbuf to NULL so that attrbuf is also NULL and the whole "if (attrbuf) { ... }" block is not executed. Michal