From: Thorsten Blum <thorsten.blum@linux•dev>
To: "David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Simon Horman <horms@kernel•org>,
Amir Goldstein <amir73il@gmail•com>, Tim Bird <tim.bird@sony•com>,
Christian Brauner <brauner@kernel•org>
Cc: Thorsten Blum <thorsten.blum@linux•dev>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH net-next] net/dns_resolver: consolidate namelen checks in dns_query
Date: Mon, 25 May 2026 11:54:01 +0200 [thread overview]
Message-ID: <20260525095400.821912-3-thorsten.blum@linux.dev> (raw)
Consolidate the namelen checks and return -EINVAL early if needed. Drop
the namelen == 0 check since it is covered by namelen < 3.
Signed-off-by: Thorsten Blum <thorsten.blum@linux•dev>
---
net/dns_resolver/dns_query.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index e1c09d7b8200..c250d82cad96 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -73,7 +73,7 @@ int dns_query(struct net *net,
kenter("%s,%*.*s,%zu,%s",
type, (int)namelen, (int)namelen, name, namelen, options);
- if (!name || namelen == 0)
+ if (!name || namelen < 3 || namelen > 255)
return -EINVAL;
/* construct the query key description as "[<type>:]<name>" */
@@ -86,8 +86,6 @@ int dns_query(struct net *net,
desclen += typelen + 1;
}
- if (namelen < 3 || namelen > 255)
- return -EINVAL;
desclen += namelen + 1;
desc = kmalloc(desclen, GFP_KERNEL);
next reply other threads:[~2026-05-25 9:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-25 9:54 Thorsten Blum [this message]
2026-05-27 12:03 ` [PATCH net-next] net/dns_resolver: consolidate namelen checks in dns_query Simon Horman
2026-05-28 0:10 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260525095400.821912-3-thorsten.blum@linux.dev \
--to=thorsten.blum@linux$(echo .)dev \
--cc=amir73il@gmail$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=tim.bird@sony$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox