summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-06-26 23:01:41 +0000
committerDavid S. Miller <davem@davemloft.net>2012-06-27 15:26:24 -0700
commitd31bb4f0621756528d11d310c44cd8076b22bc03 (patch)
treea6b2a923aa275201dfc4c9ecc717bf0f922ef4ad
parent6bc96d047fe32d76ef79f3195c52a542edf7c705 (diff)
downloadlinux-stable-d31bb4f0621756528d11d310c44cd8076b22bc03.tar.gz
linux-stable-d31bb4f0621756528d11d310c44cd8076b22bc03.tar.bz2
linux-stable-d31bb4f0621756528d11d310c44cd8076b22bc03.zip
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>
-rw-r--r--net/9p/protocol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index 9ee48cb30179..3d33ecf13327 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,