| Message ID | 1348090423-32665-5-git-send-email-minipli@googlemail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Sep 19, 2012 at 11:33:41PM +0200, Mathias Krause wrote: > 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> Patches 1-4: Acked-by: Steffen Klassert <steffen.klassert@secunet.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 7511427..9f1e749 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1423,6 +1423,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));
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> --- net/xfrm/xfrm_user.c | 1 + 1 file changed, 1 insertion(+)