| Message ID | 87a9x1j9qh.fsf@xmission.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Ignore this patch. The issue is real this fix is wrong. > diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c > index 4801c81..d7bfd27 100644 > --- a/net/xfrm/xfrm_user.c > +++ b/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, 0); > > 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, 0); > > if (ue->hard) { > uid_t loginuid = audit_get_loginuid(current); -- 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 4801c81..d7bfd27 100644 --- a/net/xfrm/xfrm_user.c +++ b/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, 0); 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, 0); if (ue->hard) { uid_t loginuid = audit_get_loginuid(current);
km_policy_expired ultimately calls xfrm_exp_policy_notify which ignores any netlink porrts specified in it's km_event paramater and simply sends a netlink multicast message. km_state_expired ultimately calls xfrm_exp_state_notify which ignores any netlink ports specified in it's km_event paramater and simply sends a netlink multicast message. Therefore neither km_policy_expired nor km_state_expired needs the bogus current->pid value that is currently passed as a netlink port and a zero can be passed instead, just like all of the other call sites of km_port_expired and km_state_expired. Cc: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- net/xfrm/xfrm_user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)