On Tue, 26 Apr 2011 14:12:37 -0700 (PDT)
Andi Kleen <[email protected]> wrote:
>
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:
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1330,16 +1330,12 @@
return err;
if (msg->msg_namelen) {
+ if (addr->nl_family != AF_NETLINK)
+ return -EINVAL;
- if (addr->nl_family != AF_NETLINK) {
- err = -EINVAL;
- goto out;
- }
dst_pid = addr->nl_pid;
dst_group = ffs(addr->nl_groups);
+ if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND))
+ return -EPERM;
- if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND)) {
- err = -EPERM;
- goto out;
- }
} else {
dst_pid = nlk->dst_pid;
dst_group = nlk->dst_group;
@@ -1391,8 +1387,6 @@
err = netlink_unicast(sk, skb, dst_pid, msg->msg_flags&MSG_DONTWAIT);
out:
- scm_destroy(siocb->scm);
- siocb->scm = NULL;
return err;
}
_
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
