diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2015-10-28 13:21:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-29 07:01:48 -0700 |
| commit | 1e0d69a9cc9172d7896c2113f983a74f6e8ff303 (patch) | |
| tree | 4e1c895f7139e926c412063176f58365299d06c9 | |
| parent | e18f6ac30d31433d8cd9ccf693d3cdd5d2e66ef9 (diff) | |
| download | linux-1e0d69a9cc9172d7896c2113f983a74f6e8ff303.tar.gz | |
Revert "Merge branch 'ipv6-overflow-arith'"
Linus dislikes these changes. To not hold up the net-merge let's revert
it for now and fix the bug like Linus suggested.
This reverts commit ec3661b42257d9a06cf0d318175623ac7a660113, reversing
changes made to c80dbe04612986fd6104b4a1be21681b113b5ac9.
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/compiler-gcc.h | 4 | ||||
| -rw-r--r-- | include/linux/overflow-arith.h | 18 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 6 |
3 files changed, 1 insertions, 27 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 82c159e0532aea..dfaa7b3e9ae900 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -237,10 +237,6 @@ #define KASAN_ABI_VERSION 3 #endif -#if GCC_VERSION >= 50000 -#define CC_HAVE_BUILTIN_OVERFLOW -#endif - #endif /* gcc version >= 40000 specific checks */ #if !defined(__noclone) diff --git a/include/linux/overflow-arith.h b/include/linux/overflow-arith.h deleted file mode 100644 index e12ccf854a70f9..00000000000000 --- a/include/linux/overflow-arith.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include <linux/kernel.h> - -#ifdef CC_HAVE_BUILTIN_OVERFLOW - -#define overflow_usub __builtin_usub_overflow - -#else - -static inline bool overflow_usub(unsigned int a, unsigned int b, - unsigned int *res) -{ - *res = a - b; - return *res > a ? true : false; -} - -#endif diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8dddb45c433e53..d03d6da772f3bc 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -28,7 +28,6 @@ #include <linux/errno.h> #include <linux/kernel.h> -#include <linux/overflow-arith.h> #include <linux/string.h> #include <linux/socket.h> #include <linux/net.h> @@ -585,10 +584,7 @@ int ip6_fragment(struct sock *sk, struct sk_buff *skb, if (np->frag_size) mtu = np->frag_size; } - - if (overflow_usub(mtu, hlen + sizeof(struct frag_hdr), &mtu) || - mtu <= 7) - goto fail_toobig; + mtu -= hlen + sizeof(struct frag_hdr); frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr, &ipv6_hdr(skb)->saddr); |