From: Jiayuan Chen <jiayuan.chen@linux.dev>
To: bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: andrew+netdev@lunn.ch, davem@davemloft.ne, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, horms@kernel.org,
ricardo@marliere.net, jiayuan.chen@linux.dev,
viro@zeniv.linux.org.uk, dmantipov@yandex.ru,
aleksander.lobakin@intel.com, linux-ppp@vger.kernel.org,
linux-kernel@vger.kernel.org, mrpre@163.com,
syzbot+853242d9c9917165d791@syzkaller.appspotmail.com
Subject: [PATCH net-next v1 1/1] ppp: Fix KMSAN warning by initializing 2-byte header
Date: Tue, 18 Feb 2025 21:31:44 +0800 [thread overview]
Message-ID: <20250218133145.265313-2-jiayuan.chen@linux.dev> (raw)
In-Reply-To: <20250218133145.265313-1-jiayuan.chen@linux.dev>
The ppp program adds a 2-byte pseudo-header for socket filters, which is
normally skipped by regular BPF programs, causing no issues.
However, for abnormal BPF programs that use these uninitialized 2 bytes,
a KMSAN warning is triggered.
Reported-by: syzbot+853242d9c9917165d791@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/bpf/000000000000dea025060d6bc3bc@google.com/
Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
---
drivers/net/ppp/ppp_generic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 4583e15ad03a..a913403d5847 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -1765,7 +1765,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
/* check if we should pass this packet */
/* the filter instructions are constructed assuming
a four-byte PPP header on each packet */
- *(u8 *)skb_push(skb, 2) = 1;
+ *(u16 *)skb_push(skb, 2) = 1;
if (ppp->pass_filter &&
bpf_prog_run(ppp->pass_filter, skb) == 0) {
if (ppp->debug & 1)
@@ -2489,7 +2489,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
if (skb_unclone(skb, GFP_ATOMIC))
goto err;
- *(u8 *)skb_push(skb, 2) = 0;
+ *(u16 *)skb_push(skb, 2) = 0;
if (ppp->pass_filter &&
bpf_prog_run(ppp->pass_filter, skb) == 0) {
if (ppp->debug & 1)
--
2.47.1
next prev parent reply other threads:[~2025-02-18 13:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 13:31 [PATCH net-next v1 0/1] ppp: Fix KMSAN uninit-value warning Jiayuan Chen
2025-02-18 13:31 ` Jiayuan Chen [this message]
2025-02-20 23:27 ` [PATCH net-next v1 1/1] ppp: Fix KMSAN warning by initializing 2-byte header Jakub Kicinski
2025-02-21 1:48 ` Jiayuan Chen
2025-02-25 9:32 ` Simon Horman
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=20250218133145.265313-2-jiayuan.chen@linux.dev \
--to=jiayuan.chen@linux.dev \
--cc=aleksander.lobakin@intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.ne \
--cc=dmantipov@yandex.ru \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ppp@vger.kernel.org \
--cc=mrpre@163.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ricardo@marliere.net \
--cc=syzbot+853242d9c9917165d791@syzkaller.appspotmail.com \
--cc=viro@zeniv.linux.org.uk \
/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).