diff options
| author | Mathias Krause <minipli@googlemail.com> | 2012-09-19 11:33:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-20 18:08:40 -0400 |
| commit | 1f86840f897717f86d523a13e99a447e6a5d2fa5 (patch) | |
| tree | 03c775c5e0db9f885d7dd24fd7f4d8ebf0caf2eb | |
| parent | 7b789836f434c87168eab067cfbed1ec4783dffd (diff) | |
| download | linux-3.10-1f86840f897717f86d523a13e99a447e6a5d2fa5.tar.gz linux-3.10-1f86840f897717f86d523a13e99a447e6a5d2fa5.tar.bz2 linux-3.10-1f86840f897717f86d523a13e99a447e6a5d2fa5.zip | |
xfrm_user: fix info leak in copy_to_user_tmpl()
The memory used for the template copy is a local stack variable. As
struct xfrm_user_tmpl contains multiple holes added by the compiler for
alignment, not initializing the memory will lead to leaking stack bytes
to userland. Add an explicit memset(0) to avoid the info leak.
Initial version of the patch by Brad Spengler.
Cc: Brad Spengler <spender@grsecurity.net>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/xfrm/xfrm_user.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 84dd85ceeee..8024b3dea8c 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1425,6 +1425,7 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb) struct xfrm_user_tmpl *up = &vec[i]; struct xfrm_tmpl *kp = &xp->xfrm_vec[i]; + memset(up, 0, sizeof(*up)); memcpy(&up->id, &kp->id, sizeof(up->id)); up->family = kp->encap_family; memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr)); |