From: Anders Larsen <al@alarsen.net>
To: Tong Zhang <ztong0001@gmail.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] qnx4_match: do not over run the buffer
Date: Sat, 21 Nov 2020 22:57:34 +0100 [thread overview]
Message-ID: <1645927.Y8UaVx19Bi@alarsen.net> (raw)
In-Reply-To: <E554952E-602B-4711-BEF1-FB3398DA7225@gmail.com>
On Saturday, 2020-11-21 22:47 Tong Zhang wrote:
>
> > On Nov 21, 2020, at 4:40 PM, Anders Larsen <al@alarsen.net> wrote:
> >
> > On Friday, 2020-11-20 22:21 Tong Zhang wrote:
> >> the di_fname may not terminated by '\0', use strnlen to prevent buffer
> >> overrun
> >>
> >> ---
> >> fs/qnx4/namei.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c
> >> index 8d72221735d7..c0e79094f578 100644
> >> --- a/fs/qnx4/namei.c
> >> +++ b/fs/qnx4/namei.c
> >> @@ -40,7 +40,7 @@ static int qnx4_match(int len, const char *name,
> >> } else {
> >> namelen = QNX4_SHORT_NAME_MAX;
> >> }
> >> - thislen = strlen( de->di_fname );
> >> + thislen = strnlen( de->di_fname, QNX4_SHORT_NAME_MAX );
> >
> > that should be
> > + thislen = strnlen( de->di_fname, namelen );
> > otherwise the length of a filename would always be limited to QNX4_SHORT_NAME_MAX (16) characters.
> >
> Why should we put something bigger here if the size of qnx4_inode_entry->di_fname is QNX4_SHORT_NAME_MAX.
> Won’t that be a problem?
If QNX4_FILE_LINK is set in de->di_status (see line 38), 'de' actually points to a struct qnx4_link_info which can hold a longer name.
That's the reason for the namelen massage.
(Please don't ask why it is not a union)
Cheers
Anders
next prev parent reply other threads:[~2020-11-21 21:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 21:21 [PATCH v1] qnx4_match: do not over run the buffer Tong Zhang
2020-11-21 21:40 ` Anders Larsen
2020-11-21 21:47 ` Tong Zhang
2020-11-21 21:57 ` Anders Larsen [this message]
2020-11-22 1:27 ` Tong Zhang
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=1645927.Y8UaVx19Bi@alarsen.net \
--to=al@alarsen.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ztong0001@gmail.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).