From 511b03134a47a1a34c8fa979a54d721f9973ece8 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 27 Oct 2006 15:29:47 -0700 Subject: [PATCH] --- yaml --- r: 40527 b: refs/heads/master c: 54489c14c058822f7019648b3718bd3820dee802 h: refs/heads/master i: 40525: 29285711217410de03a8c5947f759b1630c6675e 40523: e564d66044772e9c288543e69f8c65bb095fc88b 40519: d5bbca526494d5361bd015ef689251e4b7b8ceb6 40511: 0b4d25eef67976d288f387d432fca4839430c976 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_user.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 83109499acf7..263b9c95bf56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 201a95afaa324b23188eeec268f6bb0b4b70b710 +refs/heads/master: 54489c14c058822f7019648b3718bd3820dee802 diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c index 2b2e59d8ffbc..b43e7647e125 100644 --- a/trunk/net/xfrm/xfrm_user.c +++ b/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;