aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2021-11-18 12:32:41 -0800
committerDavid S. Miller <davem@davemloft.net>2021-11-19 11:51:26 +0000
commit8f2a83b454c9b17989843756313e0180827a7ace (patch)
treef1b5bae17dbb931bc8f2163d3e98024412623a42 /net/ipv6/route.c
parentnet: 802: Use memset_startat() to clear struct fields (diff)
downloadlinux-dev-8f2a83b454c9b17989843756313e0180827a7ace.tar.xz
linux-dev-8f2a83b454c9b17989843756313e0180827a7ace.zip
ipv6: Use memset_after() to zero rt6_info
In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memset(), avoid intentionally writing across neighboring fields. Use memset_after() to clear everything after the dst_entry member of struct rt6_info. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r--net/ipv6/route.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5e8f2f15607d..ecc6df6592a8 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -328,9 +328,7 @@ static const struct rt6_info ip6_blk_hole_entry_template = {
static void rt6_info_init(struct rt6_info *rt)
{
- struct dst_entry *dst = &rt->dst;
-
- memset(dst + 1, 0, sizeof(*rt) - sizeof(*dst));
+ memset_after(rt, 0, dst);
INIT_LIST_HEAD(&rt->rt6i_uncached);
}