Commit 621eb19c authored Nov 14, 2012 by J. Bruce Fields

svcrpc: Revert "sunrpc/cache.h: replace simple_strtoul"



Commit bbf43dc8 "sunrpc/cache.h: replace
simple_strtoul" introduced new range-checking which could cause get_int
to fail on unsigned integers too large to be represented as an int.

We could parse them as unsigned instead--but it turns out svcgssd is
actually passing down "-1" in some cases.  Which is perhaps stupid, but
there's nothing we can do about it now.

So just revert back to the previous "sloppy" behavior that accepts
either representation.

Cc: stable@vger.kernel.org
Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 2b4cf668

include/linux/sunrpc/cache.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -217,6 +217,8 @@ extern int qword_get(char *bpp, char dest, int bufsize);
		static inline int get_int(char *bpp, int anint)
		{
		char buf[50];
		char *ep;
		int rv;
		int len = qword_get(bpp, buf, sizeof(buf));

		if (len < 0)
		@@ -224,9 +226,11 @@ static inline int get_int(char *bpp, int anint)
		if (len == 0)
		return -ENOENT;

		if (kstrtoint(buf, 0, anint))
		rv = simple_strtol(buf, &ep, 0);
		if (*ep)
		return -EINVAL;

		*anint = rv;
		return 0;
		}