From: Ryan Mallon <rmallon@gmail.com>
To: Mark Salter <msalter@redhat.com>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
"trivial@kernel.org" <trivial@kernel.org>
Subject: [PATCH][REPOST] Check maxlen on strnlen_user usage
Date: Thu, 08 Sep 2011 09:54:18 +1000 [thread overview]
Message-ID: <4E68042A.1050406@gmail.com> (raw)
strnlen_user returns the length of the string including the nul
terminator. In the case where maxlen is reached strnlen_user returns
maxlen + 1. Most callsites already check for this condition. Fix the
call to strnlen_user in fs/exec.c to check for the maxlen case.
Signed-off-by: Ryan Mallon <rmallon@gmail.com>
---
diff --git a/fs/exec.c b/fs/exec.c
index 25dcbe5..e19588c 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -481,7 +481,7 @@ static int copy_strings(int argc, struct
user_arg_ptr argv,
goto out;
len = strnlen_user(str, MAX_ARG_STRLEN);
- if (!len)
+ if (!len || len> MAX_ARG_STRLEN)
goto out;
ret = -E2BIG;
next reply other threads:[~2011-09-07 23:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-07 23:54 Ryan Mallon [this message]
2011-09-08 0:06 ` [PATCH][REPOST] Check maxlen on strnlen_user usage Andrew Morton
2011-09-08 0:20 ` Ryan Mallon
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=4E68042A.1050406@gmail.com \
--to=rmallon@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=msalter@redhat.com \
--cc=trivial@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.