From 8d707d63540e64c0ffe505621ce3b7b2ca06d02a Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 7 Sep 2012 21:17:17 +0000 Subject: [PATCH] --- yaml --- r: 327835 b: refs/heads/master c: c6bb8136c95ce16545f8c4028e958c0ee6c86f23 h: refs/heads/master i: 327833: feff06360997dd649a599704b43255898d86bc8c 327831: f0f26ffa2b6c2711512d0e1560d357d68bb20eb6 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 9fda89d8db41..911f3c928cb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15e473046cb6e5d18a4d0057e61d76315230382b +refs/heads/master: c6bb8136c95ce16545f8c4028e958c0ee6c86f23 diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c index b313d932d678..5d6eb4b3c089 100644 --- a/trunk/net/xfrm/xfrm_user.c +++ b/trunk/net/xfrm/xfrm_user.c @@ -1930,7 +1930,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh, // reset the timers here? WARN(1, "Dont know what to do with soft policy expire\n"); } - km_policy_expired(xp, p->dir, up->hard, current->pid); + km_policy_expired(xp, p->dir, up->hard, nlh->nlmsg_pid); out: xfrm_pol_put(xp); @@ -1958,7 +1958,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh, err = -EINVAL; if (x->km.state != XFRM_STATE_VALID) goto out; - km_state_expired(x, ue->hard, current->pid); + km_state_expired(x, ue->hard, nlh->nlmsg_pid); if (ue->hard) { uid_t loginuid = audit_get_loginuid(current);