diff options
| author | Willem de Bruijn <willemb@google.com> | 2019-04-25 12:06:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-29 18:22:56 -0400 |
| commit | 95c169251bf734aa555a1e8043e4d88ec97a04ec (patch) | |
| tree | 9fb129a84de34397caabc0694dc1c2e6f953c7fc /net/ipv6/ip6_flowlabel.c | |
| parent | 6ee12b7b15e0b7890c196498d4207426cf47a2cb (diff) | |
| download | lwn-95c169251bf734aa555a1e8043e4d88ec97a04ec.tar.gz lwn-95c169251bf734aa555a1e8043e4d88ec97a04ec.zip | |
ipv6: invert flowlabel sharing check in process and user mode
A request for a flowlabel fails in process or user exclusive mode must
fail if the caller pid or uid does not match. Invert the test.
Previously, the test was unsafe wrt PID recycling, but indeed tested
for inequality: fl1->owner != fl->owner
Fixes: 4f82f45730c68 ("net ip6 flowlabel: Make owner a union of struct pid* and kuid_t")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index cb54a8a3c273..a05036bc808d 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -633,9 +633,9 @@ recheck: if (fl1->share == IPV6_FL_S_EXCL || fl1->share != fl->share || ((fl1->share == IPV6_FL_S_PROCESS) && - (fl1->owner.pid == fl->owner.pid)) || + (fl1->owner.pid != fl->owner.pid)) || ((fl1->share == IPV6_FL_S_USER) && - uid_eq(fl1->owner.uid, fl->owner.uid))) + !uid_eq(fl1->owner.uid, fl->owner.uid))) goto release; err = -ENOMEM; |