Home Home > GIT Browse
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
commitc70ff136aac85c337e42efcaf1d5e6fc4350a361 (patch)
treef5242b27b56f2f5cf8bcbfc95172ec8a8d0dd88f
parent1a4c3437d3867355a606acbe2f5e093529ce5da3 (diff)
- Fix backport error.rpm-2.6.32.29-0.3
- patches.fixes/af_unix-limit-recursion-level: Refresh. suse-commit: e7f3680c9f923b615ac1107cfced14e6272839c0
-rw-r--r--net/unix/af_unix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a72167724bb4..e707e26458b5 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1379,7 +1379,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
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;
@@ -1422,8 +1422,8 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
err = unix_attach_fds(siocb->scm, skb);
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);
@@ -1535,7 +1535,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
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;