summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2021-11-18 12:30:45 -0800
committerDavid S. Miller <davem@davemloft.net>2021-11-19 11:23:23 +0000
commite3617433c3da3d0859a4bc67f3f975e87f650ebf (patch)
treecb4796fddd9baca43d51ee4e10687cce93ff979c
parentf5455a1d9d499e4028b8ae8370758efad00b00e9 (diff)
downloadlinux-e3617433c3da3d0859a4bc67f3f975e87f650ebf.tar.bz2
net: 802: Use memset_startat() to clear struct fields
In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memset(), avoid intentionally writing across neighboring fields. Use memset_startat() so memset() doesn't get confused about writing beyond the destination member that is intended to be the starting point of zeroing through the end of the struct. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/802/hippi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 887e73d520e4..1997b7dd265e 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -65,7 +65,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
hip->le.src_addr_type = 2; /* 12 bit SC address */
memcpy(hip->le.src_switch_addr, dev->dev_addr + 3, 3);
- memset(&hip->le.reserved, 0, 16);
+ memset_startat(&hip->le, 0, reserved);
hip->snap.dsap = HIPPI_EXTENDED_SAP;
hip->snap.ssap = HIPPI_EXTENDED_SAP;