]> Pileus Git - ~andy/linux/commitdiff
9p: fix min_t() casting in p9pdu_vwritef()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 26 Jun 2012 23:01:41 +0000 (23:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Jun 2012 22:26:24 +0000 (15:26 -0700)
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>
net/9p/protocol.c

index 9ee48cb3017998f47928a3d8413c5df44ec4ac73..3d33ecf133271426aec0df569c5b2a4e8eb03a8a 100644 (file)
@@ -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,