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 6F303C32793 for ; Wed, 24 Aug 2022 04:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234173AbiHXEuq (ORCPT ); Wed, 24 Aug 2022 00:50:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234982AbiHXEud (ORCPT ); Wed, 24 Aug 2022 00:50:33 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBEB018C for ; Tue, 23 Aug 2022 21:50:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 99F30B80E62 for ; Wed, 24 Aug 2022 04:50:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B11C433D7; Wed, 24 Aug 2022 04:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661316630; bh=NSBbrYjnPfBcat3vUlA6vhTLf6WPPNLSa0TmouN7W/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFS0XjS2capf001tf6JFviGP5h6pR8QDsNMKpy1bsAIC/4xiGT+LK7eLT4s1oMDcY 1KpFWgdN+n6MCIFJfcc1u8p9w6OqSZeL5CRqagHW87ceXEJugu4KaQO9IObSTsGbGD 6WgXZlpLFdV4+c0zuJdmICfxbOAf8j9UPudZxMUao4N+8bXLR7xntR9VeX2DID7M+M OmK4y6f2/vSR4ix0oOudghKGyRP1k4n97Sal8JxaOQ7uo0BGUZUipVSpr6SYDLSCCg tCqpXAzjtKNWxS2twGdQq02qSMAYXIxz7T+1M8lLKbnEel/J23QxFseEtRpfER6t1N 8Mf9BMHACS26g== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, mkubecek@suse.cz, johannes@sipsolutions.net, Jakub Kicinski Subject: [PATCH net-next 6/6] ethtool: report missing header via ext_ack in the default handler Date: Tue, 23 Aug 2022 21:50:24 -0700 Message-Id: <20220824045024.1107161-7-kuba@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824045024.1107161-1-kuba@kernel.org> References: <20220824045024.1107161-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The actual presence check for the header is in ethnl_parse_header_dev_get() but it's a few layers in, and already has a ton of arguments so let's just pick the low handing fruit and check for missing header in the default request handler. Signed-off-by: Jakub Kicinski --- net/ethtool/netlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index e26079e11835..0ccb177aaf04 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -361,6 +361,9 @@ static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info) ops = ethnl_default_requests[cmd]; if (WARN_ONCE(!ops, "cmd %u has no ethnl_request_ops\n", cmd)) return -EOPNOTSUPP; + if (GENL_REQ_ATTR_CHECK(info, ops->hdr_attr)) + return -EINVAL; + req_info = kzalloc(ops->req_info_size, GFP_KERNEL); if (!req_info) return -ENOMEM; -- 2.37.2