diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2017-06-27 17:23:20 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2017-06-27 17:23:20 +0000 |
| commit | f5b7359a005e6f85cdc57e8a20d3b16e6d355777 (patch) | |
| tree | 0437847691a8524a59eea6b51f6acce40822400b /sys/kern/uipc_mbuf.c | |
| parent | 69a3d9e7dc9336be9d10f1736b505391033695cb (diff) | |
| download | src-f5b7359a005e6f85cdc57e8a20d3b16e6d355777.tar.gz src-f5b7359a005e6f85cdc57e8a20d3b16e6d355777.zip | |
Fix one more place uio_resid is truncated to int
A follow-up to r231949 and r194990.
Reported by: pho@
Reviewed by: kib@, markj@
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D11373
Notes
Notes:
svn path=/head/; revision=320415
Diffstat (limited to 'sys/kern/uipc_mbuf.c')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 7cff0a7d9251..4d4cb3888ee1 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1517,7 +1517,7 @@ m_uiotombuf(struct uio *uio, int how, int len, int align, int flags) * the total data supplied by the uio. */ if (len > 0) - total = min(uio->uio_resid, len); + total = (uio->uio_resid < len) ? uio->uio_resid : len; else total = uio->uio_resid; |