Commit 94781db5 authored by Ray Lee's avatar Ray Lee Committed by Linus Torvalds

[PATCH] Re: unix_getname buglet - > 2.5.4(?)

Micheal Meeks notes:

	"Evolution is non-functioning on recent 2.5.X kernels, due to
    mal-performance in getpeername => net/unix/af_unix.c (unix_getname),
    where it seems we switch 'sk' on 'peer', but not the (previously)
    typecast pointer to it; this fixes it."

Whitespace fixes by Ray Lee.
parent 9c7984a0
...@@ -1109,7 +1109,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -1109,7 +1109,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags)
static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer) static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct unix_sock *u = unix_sk(sk); struct unix_sock *u;
struct sockaddr_un *sunaddr=(struct sockaddr_un *)uaddr; struct sockaddr_un *sunaddr=(struct sockaddr_un *)uaddr;
int err = 0; int err = 0;
...@@ -1124,6 +1124,7 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_ ...@@ -1124,6 +1124,7 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_
sock_hold(sk); sock_hold(sk);
} }
u = unix_sk(sk);
unix_state_rlock(sk); unix_state_rlock(sk);
if (!u->addr) { if (!u->addr) {
sunaddr->sun_family = AF_UNIX; sunaddr->sun_family = AF_UNIX;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment