summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause2017-08-26 17:08:58 +0200
committerSteffen Klassert2017-08-28 10:58:02 +0200
commit50329c8a340c9dea60d837645fcf13fc36bfb84d (patch)
treec54e85cb149711b653ef3953d6dbe18e4d444615 /net
parentxfrm_user: fix info leak in copy_user_offload() (diff)
downloadkernel-qcow2-linux-50329c8a340c9dea60d837645fcf13fc36bfb84d.tar.gz
kernel-qcow2-linux-50329c8a340c9dea60d837645fcf13fc36bfb84d.tar.xz
kernel-qcow2-linux-50329c8a340c9dea60d837645fcf13fc36bfb84d.zip
xfrm_user: fix info leak in xfrm_notify_sa()
The memory reserved to dump the ID of the xfrm state includes a padding byte in struct xfrm_usersa_id added by the compiler for alignment. To prevent the heap info leak, memset(0) the whole struct before filling it. Cc: Herbert Xu <herbert@gondor.apana.org.au> Fixes: 0603eac0d6b7 ("[IPSEC]: Add XFRMA_SA/XFRMA_POLICY for delete notification") Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_user.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3259555ae7d7..c33516ef52f2 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2715,6 +2715,7 @@ static int xfrm_notify_sa(struct xfrm_state *x, const struct km_event *c)
struct nlattr *attr;
id = nlmsg_data(nlh);
+ memset(id, 0, sizeof(*id));
memcpy(&id->daddr, &x->id.daddr, sizeof(id->daddr));
id->spi = x->id.spi;
id->family = x->props.family;