Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54489c14 authored by David S. Miller's avatar David S. Miller
Browse files

[XFRM] xfrm_user: Fix unaligned accesses. 



Use memcpy() to move xfrm_address_t objects in and out
of netlink messages.  The vast majority of xfrm_user was
doing this properly, except for copy_from_user_state()
and copy_to_user_state().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 201a95af

net/xfrm/xfrm_user.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * 
	x->props.replay_window = p->replay_window;

	x->props.reqid = p->reqid;

	x->props.family = p->family;

	x->props.saddr = p->saddr;

	memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));

	x->props.flags = p->flags;

}
@@ -545,7 +545,7 @@ static void copy_to_user_state(struct xfrm_state *x, struct xfrm_usersa_info *p) 
	memcpy(&p->lft, &x->lft, sizeof(p->lft));

	memcpy(&p->curlft, &x->curlft, sizeof(p->curlft));

	memcpy(&p->stats, &x->stats, sizeof(p->stats));

	p->saddr = x->props.saddr;

	memcpy(&p->saddr, &x->props.saddr, sizeof(p->saddr));

	p->mode = x->props.mode;

	p->replay_window = x->props.replay_window;

	p->reqid = x->props.reqid;