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 commitec3661b422
, reversing changes made toc80dbe0461
. 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>
This commit is contained in:
parent
e18f6ac30d
commit
1e0d69a9cc
|
@ -237,10 +237,6 @@
|
||||||
#define KASAN_ABI_VERSION 3
|
#define KASAN_ABI_VERSION 3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GCC_VERSION >= 50000
|
|
||||||
#define CC_HAVE_BUILTIN_OVERFLOW
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* gcc version >= 40000 specific checks */
|
#endif /* gcc version >= 40000 specific checks */
|
||||||
|
|
||||||
#if !defined(__noclone)
|
#if !defined(__noclone)
|
||||||
|
|
|
@ -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
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/overflow-arith.h>
|
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/socket.h>
|
#include <linux/socket.h>
|
||||||
#include <linux/net.h>
|
#include <linux/net.h>
|
||||||
|
@ -585,10 +584,7 @@ int ip6_fragment(struct sock *sk, struct sk_buff *skb,
|
||||||
if (np->frag_size)
|
if (np->frag_size)
|
||||||
mtu = np->frag_size;
|
mtu = np->frag_size;
|
||||||
}
|
}
|
||||||
|
mtu -= hlen + sizeof(struct frag_hdr);
|
||||||
if (overflow_usub(mtu, hlen + sizeof(struct frag_hdr), &mtu) ||
|
|
||||||
mtu <= 7)
|
|
||||||
goto fail_toobig;
|
|
||||||
|
|
||||||
frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr,
|
frag_id = ipv6_select_ident(net, &ipv6_hdr(skb)->daddr,
|
||||||
&ipv6_hdr(skb)->saddr);
|
&ipv6_hdr(skb)->saddr);
|
||||||
|
|
Loading…
Reference in a new issue