Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 01db403cf99f739f86903314a489fb420e0e254f

Authored by David S. Miller
1 parent 0b20406cda
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

tcp: Fix >4GB writes on 64-bit. 

Fixes kernel bugzilla #16603

tcp_sendmsg() truncates iov_len to an 'int' which a 4GB write to write
zero bytes, for example.

There is also the problem higher up of how verify_iovec() works.  It
wants to prevent the total length from looking like an error return
value.

However it does this using 'int', but syscalls return 'long' (and
thus signed 64-bit on 64-bit machines).  So it could trigger
false-positives on 64-bit as written.  So fix it to use 'long'.

Reported-by: Olaf Bonorden <bono@onlinehome.de>
Reported-by: Daniel Büse <dbuese@gmx.de>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 5 additions and 4 deletions Side-by-side Diff

include/linux/socket.h
Diff comments   View file @ 01db403
... ... @@ -322,7 +322,7 @@
322 322 int offset,
323 323 unsigned int len, __wsum *csump);
324 324  
325   -extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
  325 +extern long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode);
326 326 extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);
327 327 extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata,
328 328 int offset, int len);
... ... @@ -35,9 +35,10 @@
35 35 * in any case.
36 36 */
37 37  
38   -int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
  38 +long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
39 39 {
40   - int size, err, ct;
  40 + int size, ct;
  41 + long err;
41 42  
42 43 if (m->msg_namelen) {
43 44 if (mode == VERIFY_READ) {
... ... @@ -943,7 +943,7 @@
943 943 sg = sk->sk_route_caps & NETIF_F_SG;
944 944  
945 945 while (--iovlen >= 0) {
946   - int seglen = iov->iov_len;
  946 + size_t seglen = iov->iov_len;
947 947 unsigned char __user *from = iov->iov_base;
948 948  
949 949 iov++;