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 6EFCAC47089 for ; Mon, 5 Dec 2022 14:28:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbiLEO2M (ORCPT ); Mon, 5 Dec 2022 09:28:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231904AbiLEO2L (ORCPT ); Mon, 5 Dec 2022 09:28:11 -0500 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C5910BC22; Mon, 5 Dec 2022 06:28:10 -0800 (PST) Date: Mon, 5 Dec 2022 15:28:07 +0100 From: Pablo Neira Ayuso To: Li Qiong Cc: Jozsef Kadlecsik , Florian Westphal , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, kernel-janitors@vger.kernel.org, coreteam@netfilter.org, Yu Zhe Subject: Re: [PATCH] netfilter: nfnetlink: check 'skb->dev' pointer in nfulnl_log_packet() Message-ID: References: <20221202083304.9005-1-liqiong@nfschina.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20221202083304.9005-1-liqiong@nfschina.com> Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Fri, Dec 02, 2022 at 04:33:04PM +0800, Li Qiong wrote: > The 'skb->dev' may be NULL, it should be better to check it. > > Signed-off-by: Li Qiong > --- > net/netfilter/nfnetlink_log.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c > index d97eb280cb2e..74ac9fa40137 100644 > --- a/net/netfilter/nfnetlink_log.c > +++ b/net/netfilter/nfnetlink_log.c > @@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log, > } > } > > - if (indev && skb_mac_header_was_set(skb)) { > + if (indev && skb->dev && skb_mac_header_was_set(skb)) { > if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) || > nla_put_be16(inst->skb, NFULA_HWLEN, > htons(skb->dev->hard_header_len))) > @@ -724,7 +724,7 @@ nfulnl_log_packet(struct net *net, > + nla_total_size(sizeof(struct nfulnl_msg_packet_timestamp)) > + nla_total_size(sizeof(struct nfgenmsg)); /* NLMSG_DONE */ > > - if (in && skb_mac_header_was_set(skb)) { > + if (in && skb->dev && skb_mac_header_was_set(skb)) { > size += nla_total_size(skb->dev->hard_header_len) > + nla_total_size(sizeof(u_int16_t)) /* hwtype */ > + nla_total_size(sizeof(u_int16_t)); /* hwlen */ skb->dev is always guaranteed to be set in this path.