From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 26 Jun 2012 23:01:41 +0000 (+0000)
Subject: 9p: fix min_t() casting in p9pdu_vwritef()
X-Git-Tag: v3.5-rc5~17^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d31bb4f0621756528d11d310c44cd8076b22bc03;p=users%2Fdwmw2%2Flinux.git

9p: fix min_t() casting in p9pdu_vwritef()

I don't think we're actually likely to hit this limit but if we do
then the comparison should be done as size_t.  The original code
is equivalent to:
        len = strlen(sptr) % USHRT_MAX;

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index 9ee48cb301799..3d33ecf133271 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -368,7 +368,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt,
 				const char *sptr = va_arg(ap, const char *);
 				uint16_t len = 0;
 				if (sptr)
-					len = min_t(uint16_t, strlen(sptr),
+					len = min_t(size_t, strlen(sptr),
 								USHRT_MAX);
 
 				errcode = p9pdu_writef(pdu, proto_version,