From: Dan Carpenter <dan.carpenter@oracle.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Sasha Levin <levinsasha928@gmail.com>,
linux-kernel@vger.kernel.org, Neil Brown <neilb@suse.de>,
linux-nfs@vger.kernel.org
Subject: [patch] nfsd: remove some unneeded checks
Date: Fri, 20 Jan 2012 10:48:18 +0300 [thread overview]
Message-ID: <20120120074818.GA12039@mwanda> (raw)
In-Reply-To: <20120118224107.GC27205@fieldses.org>
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
We check for zero length strings in the caller now, so these aren't
needed.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index cf8a6bd..8e9689a 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -87,7 +87,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
struct svc_expkey key;
struct svc_expkey *ek = NULL;
- if (mlen < 1 || mesg[mlen-1] != '\n')
+ if (mesg[mlen - 1] != '\n')
return -EINVAL;
mesg[mlen-1] = 0;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 01153ea..6ab3573 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -509,7 +509,7 @@ static int unix_gid_parse(struct cache_detail *cd,
time_t expiry;
struct unix_gid ug, *ugp;
- if (mlen <= 0 || mesg[mlen-1] != '\n')
+ if (mesg[mlen - 1] != '\n')
return -EINVAL;
mesg[mlen-1] = 0;
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-01-20 7:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-18 10:14 [PATCH] nfsd: Fix oops when parsing a 0 length export Sasha Levin
2011-11-22 20:28 ` J. Bruce Fields
2011-11-22 20:33 ` Sasha Levin
2011-11-22 20:59 ` J. Bruce Fields
2012-01-16 11:52 ` [patch] nfsd: oopses in cache_parse() Dan Carpenter
2012-01-16 15:50 ` J. Bruce Fields
2012-01-18 9:55 ` Dan Carpenter
2012-01-18 9:56 ` [patch] nfsd: don't allow zero length strings " Dan Carpenter
2012-01-18 22:41 ` J. Bruce Fields
2012-01-20 7:48 ` Dan Carpenter [this message]
2012-01-20 18:35 ` [patch] nfsd: remove some unneeded checks J. Bruce Fields
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=20120120074818.GA12039@mwanda \
--to=dan.carpenter@oracle.com \
--cc=bfields@fieldses.org \
--cc=levinsasha928@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
/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