From: Edward Adam Davis <eadavis@qq.com>
To: eadavis@qq.com
Cc: davem@davemloft.net, dhowells@redhat.com, edumazet@google.com,
jarkko@kernel.org, jmorris@namei.org, keyrings@vger.kernel.org,
kuba@kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org, netdev@vger.kernel.org,
pabeni@redhat.com, paul@paul-moore.com, serge@hallyn.com,
syzbot+94bbb75204a05da3d89f@syzkaller.appspotmail.com,
syzkaller-bugs@googlegroups.com
Subject: [PATCH V2 next] keys/dns: fix slab-out-of-bounds in dns_resolver_preparse
Date: Thu, 14 Dec 2023 22:46:10 +0800 [thread overview]
Message-ID: <tencent_7D663C8936BA96F837124A4474AF76ED6709@qq.com> (raw)
In-Reply-To: <tencent_B0E34B701B7025C7BAFDBB2833BB9EE41B08@qq.com>
bin will be forcibly converted to "struct dns_server_list_v1_header *", so it
is necessary to compare datalen with sizeof(*v1).
Fixes: b946001d3bb1 ("keys, dns: Allow key types (eg. DNS) to be reclaimed immediately on expiry")
Reported-and-tested-by: syzbot+94bbb75204a05da3d89f@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
---
net/dns_resolver/dns_key.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 3233f4f25fed..15f19521021c 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -104,7 +104,7 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)
if (data[0] == 0) {
/* It may be a server list. */
- if (datalen <= sizeof(*bin))
+ if (datalen <= sizeof(*v1))
return -EINVAL;
bin = (const struct dns_payload_header *)data;
--
2.43.0
next prev parent reply other threads:[~2023-12-14 14:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-14 8:15 [syzbot] [net?] KASAN: slab-out-of-bounds Read in dns_resolver_preparse syzbot
2023-12-14 14:33 ` [PATCH next] keys/dns: datalen must greater than sizeof(*v1) Edward Adam Davis
2023-12-14 14:46 ` Edward Adam Davis [this message]
2023-12-16 21:06 ` [PATCH V2 next] keys/dns: fix slab-out-of-bounds in dns_resolver_preparse Simon Horman
2023-12-15 3:00 ` [PATCH next] keys/dns: datalen must greater than sizeof(*v1) Jarkko Sakkinen
2023-12-23 23:17 ` [syzbot] [net?] KASAN: slab-out-of-bounds Read in dns_resolver_preparse David Howells
2023-12-23 23:17 ` syzbot
2023-12-23 23:34 ` David Howells
2023-12-23 23:59 ` syzbot
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=tencent_7D663C8936BA96F837124A4474AF76ED6709@qq.com \
--to=eadavis@qq.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=edumazet@google.com \
--cc=jarkko@kernel.org \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=syzbot+94bbb75204a05da3d89f@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).