diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-04-26 20:21:50 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:17 -0700 |
| commit | 47764cfbd17b4796f7f2d90c13832313ea95343f (patch) | |
| tree | ed6ea4c3e4904d64500503538e6991abdc38839e | |
| parent | f60b63aaa8f2054b5c8bac192ba99e3a99f2d72f (diff) | |
2.6.35.13 longterm review
Also please revert the patch "fix-cred-leak-in-af_netlink" from 2.6.35.12.
The proper fix was "af_netlink-add-needed-scm_destroy-after-scm_send" which
was also added in that release. Here's a revert patch:
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -rw-r--r-- | net/netlink/af_netlink.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index eb164787326..eea6817fa9f 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1333,16 +1333,12 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, return err; if (msg->msg_namelen) { - if (addr->nl_family != AF_NETLINK) { - err = -EINVAL; - goto out; - } + if (addr->nl_family != AF_NETLINK) + return -EINVAL; dst_pid = addr->nl_pid; dst_group = ffs(addr->nl_groups); - if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND)) { - err = -EPERM; - goto out; - } + if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND)) + return -EPERM; } else { dst_pid = nlk->dst_pid; dst_group = nlk->dst_group; @@ -1394,8 +1390,6 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, err = netlink_unicast(sk, skb, dst_pid, msg->msg_flags&MSG_DONTWAIT); out: - scm_destroy(siocb->scm); - siocb->scm = NULL; return err; } |