diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-08 05:32:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-08 05:32:32 +0300 |
| commit | ccb48e837cf23b101de9799ab92cc2821133a1c8 (patch) | |
| tree | d6580b8fca3506e6832347c05c878ed5edc8deb1 /include | |
| parent | f12c643209db0626f2f54780d86bb93bfa7a9c2d (diff) | |
| parent | 3099a52918937ab86ec47038ad80d377ba16c531 (diff) | |
| download | linux-ccb48e837cf23b101de9799ab92cc2821133a1c8.tar.xz | |
Merge branch 'net-fix-uninit-values-in-networking-stack'
Eric Dumazet says:
====================
net: fix uninit-values in networking stack
It seems syzbot got new features enabled, and fired some interesting
reports. Oh well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 1 | ||||
| -rw-r--r-- | include/net/nexthop.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 899495589a7e..c7be1ca8e562 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h @@ -43,6 +43,7 @@ struct inet_timewait_sock { #define tw_family __tw_common.skc_family #define tw_state __tw_common.skc_state #define tw_reuse __tw_common.skc_reuse +#define tw_reuseport __tw_common.skc_reuseport #define tw_ipv6only __tw_common.skc_ipv6only #define tw_bound_dev_if __tw_common.skc_bound_dev_if #define tw_node __tw_common.skc_nulls_node diff --git a/include/net/nexthop.h b/include/net/nexthop.h index 36bb794f5cd6..902ff382a6dc 100644 --- a/include/net/nexthop.h +++ b/include/net/nexthop.h @@ -7,7 +7,7 @@ static inline int rtnh_ok(const struct rtnexthop *rtnh, int remaining) { - return remaining >= sizeof(*rtnh) && + return remaining >= (int)sizeof(*rtnh) && rtnh->rtnh_len >= sizeof(*rtnh) && rtnh->rtnh_len <= remaining; } |