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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78DA3E7D26A for ; Tue, 26 Sep 2023 09:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234122AbjIZJOn (ORCPT ); Tue, 26 Sep 2023 05:14:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234110AbjIZJOl (ORCPT ); Tue, 26 Sep 2023 05:14:41 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37D21BF for ; Tue, 26 Sep 2023 02:14:34 -0700 (PDT) Received: from n0-1 by orbyte.nwl.cc with local (Exim 4.94.2) (envelope-from ) id 1ql49H-0000Oj-Hf; Tue, 26 Sep 2023 11:14:31 +0200 Date: Tue, 26 Sep 2023 11:14:31 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, Florian Westphal Subject: Re: [nf PATCH 2/5] netfilter: nf_tables: Add locking for NFT_MSG_GETRULE_RESET requests Message-ID: Mail-Followup-To: Phil Sutter , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, Florian Westphal References: <20230923013807.11398-1-phil@nwl.cc> <20230923013807.11398-3-phil@nwl.cc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Mon, Sep 25, 2023 at 12:47:14PM +0200, Pablo Neira Ayuso wrote: > On Sat, Sep 23, 2023 at 03:38:04AM +0200, Phil Sutter wrote: > [...] > > @@ -3598,60 +3618,107 @@ static int nf_tables_getrule(struct sk_buff *skb, const struct nfnl_info *info, > > struct net *net = info->net; > > struct nft_table *table; > > struct sk_buff *skb2; > > - bool reset = false; > > int err; > > > > - if (info->nlh->nlmsg_flags & NLM_F_DUMP) { > > - struct netlink_dump_control c = { > > - .start= nf_tables_dump_rules_start, > > - .dump = nf_tables_dump_rules, > > - .done = nf_tables_dump_rules_done, > > - .module = THIS_MODULE, > > - .data = (void *)nla, > > - }; > > - > > - return nft_netlink_dump_start_rcu(info->sk, skb, info->nlh, &c); > > - } > > - > > table = nft_table_lookup(net, nla[NFTA_RULE_TABLE], family, genmask, 0); > > if (IS_ERR(table)) { > > NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_TABLE]); > > - return PTR_ERR(table); > > + return ERR_CAST(table); > > return ERR_PTR(table); > > for consistency and to make this batch slightly smaller? ERR_PTR() expects a long arg, while 'table' is a pointer. The only valid alternatives are '(struct sk_buff *)table' and 'ERR_PTR(PTR_ERR(table)). I don't quite understand what's the problem with ERR_CAST(), it seems to exist exactly for this purpose. Cheers, Phil