From: Fedor Pchelkin <pchelkin@ispras.ru>
To: Eric Van Hensbergen <ericvh@kernel.org>
Cc: Fedor Pchelkin <pchelkin@ispras.ru>,
Latchesar Ionkov <lucho@ionkov.net>,
Dominique Martinet <asmadeus@codewreck.org>,
Christian Schoenebeck <linux_oss@crudebyte.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
v9fs@lists.linux.dev, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
lvc-project@linuxtesting.org
Subject: [PATCH] net: 9p: avoid freeing uninit memory in p9pdu_vreadf
Date: Tue, 5 Dec 2023 11:05:22 +0300 [thread overview]
Message-ID: <20231205080524.6635-1-pchelkin@ispras.ru> (raw)
If an error occurs while processing an array of strings in p9pdu_vreadf
then uninitialized members of *wnames array are freed.
Fix this by iterating over only lower indices of the array.
Found by Linux Verification Center (linuxtesting.org).
Fixes: ace51c4dd2f9 ("9p: add new protocol support code")
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
---
net/9p/protocol.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index 4e3a2a1ffcb3..d33387e74a66 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -393,6 +393,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
case 'T':{
uint16_t *nwname = va_arg(ap, uint16_t *);
char ***wnames = va_arg(ap, char ***);
+ int i;
errcode = p9pdu_readf(pdu, proto_version,
"w", nwname);
@@ -406,8 +407,6 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
}
if (!errcode) {
- int i;
-
for (i = 0; i < *nwname; i++) {
errcode =
p9pdu_readf(pdu,
@@ -421,9 +420,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt,
if (errcode) {
if (*wnames) {
- int i;
-
- for (i = 0; i < *nwname; i++)
+ while (--i >= 0)
kfree((*wnames)[i]);
}
kfree(*wnames);
--
2.43.0
next reply other threads:[~2023-12-05 8:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 8:05 Fedor Pchelkin [this message]
2023-12-05 9:07 ` [PATCH] net: 9p: avoid freeing uninit memory in p9pdu_vreadf Dominique Martinet
2023-12-05 9:19 ` [PATCH v2] " Fedor Pchelkin
2023-12-05 9:31 ` Dominique Martinet
2023-12-05 12:15 ` Fedor Pchelkin
2023-12-05 12:43 ` Dominique Martinet
2023-12-05 12:29 ` Christian Schoenebeck
2023-12-05 13:09 ` Fedor Pchelkin
2023-12-05 18:05 ` [PATCH v3] " Fedor Pchelkin
2023-12-06 13:12 ` Christian Schoenebeck
2023-12-06 20:09 ` [PATCH v4] " Fedor Pchelkin
2023-12-07 12:54 ` Christian Schoenebeck
2023-12-11 23:21 ` Dominique Martinet
2024-01-07 7:56 ` Vitaly Chikunov
2024-01-07 9:48 ` Fedor Pchelkin
2024-01-07 10:14 ` Vitaly Chikunov
2024-01-07 10:26 ` Dominique Martinet
2023-12-11 13:51 ` 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=20231205080524.6635-1-pchelkin@ispras.ru \
--to=pchelkin@ispras.ru \
--cc=asmadeus@codewreck.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=ericvh@kernel.org \
--cc=khoroshilov@ispras.ru \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=lucho@ionkov.net \
--cc=lvc-project@linuxtesting.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=v9fs@lists.linux.dev \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).