remove af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch from 3.4 and...

It broke older versions of udev

diff --git a/queue-3.4/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch b/queue-3.4/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
deleted file mode 100644 (file)
index 991950b..0000000
--- a/queue-3.4/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0548cb9cbc64d221fb3851f7c8a0ccb8bc095acb Mon Sep 17 00:00:00 2001
-From: dingtianhong <dingtianhong@huawei.com>
-Date: Mon, 25 Mar 2013 17:02:04 +0000
-Subject: af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
-
-
-From: dingtianhong <dingtianhong@huawei.com>
-
-[ Upstream commit 14134f6584212d585b310ce95428014b653dfaf6 ]
-
-SCM_SCREDENTIALS should apply to write() syscalls only either source or destination
-socket asserted SOCK_PASSCRED. The original implememtation in maybe_add_creds is wrong,
-and breaks several LSB testcases ( i.e. /tset/LSB.os/netowkr/recvfrom/T.recvfrom).
-
-Origionally-authored-by: Karel Srot <ksrot@redhat.com>
-Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/unix/af_unix.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/unix/af_unix.c
-+++ b/net/unix/af_unix.c
-@@ -1414,8 +1414,8 @@ static void maybe_add_creds(struct sk_bu
-       if (UNIXCB(skb).cred)
-               return;
-       if (test_bit(SOCK_PASSCRED, &sock->flags) ||
--          !other->sk_socket ||
--          test_bit(SOCK_PASSCRED, &other->sk_socket->flags)) {
-+          (other->sk_socket &&
-+          test_bit(SOCK_PASSCRED, &other->sk_socket->flags))) {
-               UNIXCB(skb).pid  = get_pid(task_tgid(current));
-               UNIXCB(skb).cred = get_current_cred();
-       }

diff --git a/queue-3.4/series b/queue-3.4/series
index 5edea8d78b88f093d613359a1163499e96a9a74f..c3fd8563694a96ab844a2a0506b237edcbab71d4 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -49,7 +49,6 @@ tcp-undo-spurious-timeout-after-sack-reneging.patch
 8021q-fix-a-potential-use-after-free.patch
 thermal-shorten-too-long-mcast-group-name.patch
 unix-fix-a-race-condition-in-unix_release.patch
-af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
 bonding-remove-already-created-master-sysfs-link-on-failure.patch
 bonding-fix-miimon-and-arp_interval-delayed-work-race-conditions.patch
 bonding-fix-disabling-of-arp_interval-and-miimon.patch

diff --git a/queue-3.8/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch b/queue-3.8/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
deleted file mode 100644 (file)
index a236303..0000000
--- a/queue-3.8/af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a54e981e407135779bf1d9121c515f7715c4d520 Mon Sep 17 00:00:00 2001
-From: dingtianhong <dingtianhong@huawei.com>
-Date: Mon, 25 Mar 2013 17:02:04 +0000
-Subject: af_unix: dont send SCM_CREDENTIAL when dest socket is NULL
-
-
-From: dingtianhong <dingtianhong@huawei.com>
-
-[ Upstream commit 14134f6584212d585b310ce95428014b653dfaf6 ]
-
-SCM_SCREDENTIALS should apply to write() syscalls only either source or destination
-socket asserted SOCK_PASSCRED. The original implememtation in maybe_add_creds is wrong,
-and breaks several LSB testcases ( i.e. /tset/LSB.os/netowkr/recvfrom/T.recvfrom).
-
-Origionally-authored-by: Karel Srot <ksrot@redhat.com>
-Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/unix/af_unix.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/unix/af_unix.c
-+++ b/net/unix/af_unix.c
-@@ -1414,8 +1414,8 @@ static void maybe_add_creds(struct sk_bu
-       if (UNIXCB(skb).cred)
-               return;
-       if (test_bit(SOCK_PASSCRED, &sock->flags) ||
--          !other->sk_socket ||
--          test_bit(SOCK_PASSCRED, &other->sk_socket->flags)) {
-+          (other->sk_socket &&
-+          test_bit(SOCK_PASSCRED, &other->sk_socket->flags))) {
-               UNIXCB(skb).pid  = get_pid(task_tgid(current));
-               UNIXCB(skb).cred = get_current_cred();
-       }

diff --git a/queue-3.8/series b/queue-3.8/series
index 49e04042bb75631e1bdee4ba6f37c7674af3e6f8..6cf7265706041e9204029b1705d5ffa7ccf58ea6 100644 (file)
--- a/queue-3.8/series
+++ b/queue-3.8/series
@@ -102,7 +102,6 @@ tcp-undo-spurious-timeout-after-sack-reneging.patch
 8021q-fix-a-potential-use-after-free.patch
 thermal-shorten-too-long-mcast-group-name.patch
 unix-fix-a-race-condition-in-unix_release.patch
-af_unix-dont-send-scm_credential-when-dest-socket-is-null.patch
 bonding-remove-already-created-master-sysfs-link-on-failure.patch
 bonding-fix-disabling-of-arp_interval-and-miimon.patch
 drivers-net-ethernet-davinci_emac-use-netif_wake_queue-while-restarting-tx-queue.patch