From: Neil Brown <neilb@suse.de>
To: Steve Dickson <steved@redhat.com>
Cc: linux-nfs@vger.kernel.org, NeilBrown <neilb@suse.de>
Subject: [PATCH 6/6] v4_root_add_parents: remove a possible buffer overflow.
Date: Tue, 24 Apr 2012 15:46:38 +1000 [thread overview]
Message-ID: <20120424054638.20130.42383.stgit@notabene.brown> (raw)
In-Reply-To: <20120424054003.20130.16209.stgit@notabene.brown>
The loop in v4root_add_parents() is a little odd.
The first time through, 'ptr' points immediately "beyond"
a '/' character (the first). For every other iterration it points
directly "at" a '/' character.
Such inconsistency is error prone and infact there is an error.
If "path" is precisely "/", then the first call to
ptr = strchr(ptr, '/')
will be given a 'ptr' which is beyond the '\0' at the end of
"path". This could potentially contain anything and the strchr()
could search well beyond a buffer (though this depends on exactly how
the string is set up which depends on separate code).
So change the loop to have 'ptr' always point at a '/', and
handle the special case of "/" explicitly.
Signed-off-by: NeilBrown <neilb@suse.de>
---
utils/mountd/v4root.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index 57ee0b2..708eb61 100644
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -150,13 +150,13 @@ static int v4root_add_parents(nfs_export *exp)
"pseudo export for '%s'", exp->m_export.e_path);
return -ENOMEM;
}
- for (ptr = path + 1; ptr; ptr = strchr(ptr, '/')) {
+ for (ptr = path; ptr; ptr = strchr(ptr, '/')) {
int ret;
char saved;
saved = *ptr;
*ptr = '\0';
- ret = pseudofs_update(hostname, path, exp);
+ ret = pseudofs_update(hostname, *path ? path : "/", exp);
if (ret)
return ret;
*ptr = saved;
next prev parent reply other threads:[~2012-04-24 5:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 5:46 [PATCH 0/6] fix some problems with v4root handling in mountd Neil Brown
2012-04-24 5:46 ` [PATCH 3/6] nfsd_fh: if two exports are possible, choose the one without V4ROOT Neil Brown
2012-04-24 5:46 ` [PATCH 4/6] v4set_root: force "fsid=0" for all exports of '/' Neil Brown
2012-04-24 22:03 ` J. Bruce Fields
2012-04-24 5:46 ` [PATCH 5/6] v4root: set the time-to-live for V4ROOT exports to the DEFAULT Neil Brown
2012-04-24 5:46 ` [PATCH 2/6] auth_authenticate_newcache: prefer non-V4ROOT export over V4ROOT exports Neil Brown
2012-04-24 5:46 ` Neil Brown [this message]
2012-04-24 5:46 ` [PATCH 1/6] lookup_export: really prefer nonV4ROOT exports Neil Brown
2012-04-24 22:05 ` [PATCH 0/6] fix some problems with v4root handling in mountd J. Bruce Fields
2012-05-01 19:33 ` Steve Dickson
2012-05-02 1:23 ` NeilBrown
2012-05-02 10:32 ` Steve Dickson
2012-05-02 23:08 ` NeilBrown
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=20120424054638.20130.42383.stgit@notabene.brown \
--to=neilb@suse.de \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.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).