Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Galbraith <mgalbraith@suse.de>2011-02-25 13:36:59 +0100
committerMike Galbraith <mgalbraith@suse.de>2011-02-25 13:36:59 +0100
commite7f3680c9f923b615ac1107cfced14e6272839c0 (patch)
treeb506298a9d8f5be676bccd386b2685c9995394d0
parent9436cad44b59b3f0e73485065967320e6d7e8282 (diff)
- Fix backport error.rpm-2.6.32.29-0.3
- patches.fixes/af_unix-limit-recursion-level: Refresh.
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.fixes/af_unix-limit-recursion-level9
2 files changed, 10 insertions, 5 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 2a9af6777f..c3bcfe2091 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Feb 25 13:35:15 CET 2011 - mgalbraith@suse.de
+
+- Fix backport error.
+- patches.fixes/af_unix-limit-recursion-level: Refresh.
+
+-------------------------------------------------------------------
Thu Feb 24 16:38:48 CET 2011 - tiwai@suse.de
- patches.drivers/alsa-usb-fix-oops-at-disconnection: ALSA:
diff --git a/patches.fixes/af_unix-limit-recursion-level b/patches.fixes/af_unix-limit-recursion-level
index 334d663473..a447752ee6 100644
--- a/patches.fixes/af_unix-limit-recursion-level
+++ b/patches.fixes/af_unix-limit-recursion-level
@@ -105,22 +105,21 @@ Index: linux-2.6.32-SLE11-SP1/net/unix/af_unix.c
struct sk_buff *skb;
long timeo;
struct scm_cookie tmp_scm;
-+ int max_level;
++ int max_level = 0;
if (NULL == siocb->scm)
siocb->scm = &tmp_scm;
-@@ -1401,9 +1420,10 @@ static int unix_dgram_sendmsg(struct kio
+@@ -1401,8 +1420,9 @@ static int unix_dgram_sendmsg(struct kio
memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
if (siocb->scm->fp) {
err = unix_attach_fds(siocb->scm, skb);
- if (err)
+ if (err < 0)
goto out_free;
++ max_level = err + 1;
}
-+ max_level = err + 1;
unix_get_secdata(siocb->scm, skb);
- skb_reset_transport_header(skb);
@@ -1483,6 +1503,8 @@ restart:
}
@@ -134,7 +133,7 @@ Index: linux-2.6.32-SLE11-SP1/net/unix/af_unix.c
int sent = 0;
struct scm_cookie tmp_scm;
bool fds_sent = false;
-+ int max_level;
++ int max_level = 0;
if (NULL == siocb->scm)
siocb->scm = &tmp_scm;