Skip to content

Commit

Permalink
9p: fix min_t() casting in p9pdu_vwritef()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jun 27, 2012
1 parent 6bc96d0 commit d31bb4f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/9p/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d31bb4f

Please sign in to comment.