---

yaml
---
r: 40527
b: refs/heads/master
c: 54489c1
h: refs/heads/master
i:
  40525: 2928571
  40523: e564d66
  40519: d5bbca5
  40511: 0b4d25e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201a95afaa324b23188eeec268f6bb0b4b70b710
+refs/heads/master: 54489c14c058822f7019648b3718bd3820dee802

trunk/net/xfrm/xfrm_user.c

@@ -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;