diff options
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r-- | net/unix/af_unix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index d545e1d0dea2..723698416242 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -637,7 +637,7 @@ static int unix_stream_connect(struct socket *, struct sockaddr *, | |||
637 | int addr_len, int flags); | 637 | int addr_len, int flags); |
638 | static int unix_socketpair(struct socket *, struct socket *); | 638 | static int unix_socketpair(struct socket *, struct socket *); |
639 | static int unix_accept(struct socket *, struct socket *, int, bool); | 639 | static int unix_accept(struct socket *, struct socket *, int, bool); |
640 | static int unix_getname(struct socket *, struct sockaddr *, int *, int); | 640 | static int unix_getname(struct socket *, struct sockaddr *, int); |
641 | static __poll_t unix_poll(struct file *, struct socket *, poll_table *); | 641 | static __poll_t unix_poll(struct file *, struct socket *, poll_table *); |
642 | static __poll_t unix_dgram_poll(struct file *, struct socket *, | 642 | static __poll_t unix_dgram_poll(struct file *, struct socket *, |
643 | poll_table *); | 643 | poll_table *); |
@@ -1453,7 +1453,7 @@ out: | |||
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | 1455 | ||
1456 | static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer) | 1456 | static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int peer) |
1457 | { | 1457 | { |
1458 | struct sock *sk = sock->sk; | 1458 | struct sock *sk = sock->sk; |
1459 | struct unix_sock *u; | 1459 | struct unix_sock *u; |
@@ -1476,12 +1476,12 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_ | |||
1476 | if (!u->addr) { | 1476 | if (!u->addr) { |
1477 | sunaddr->sun_family = AF_UNIX; | 1477 | sunaddr->sun_family = AF_UNIX; |
1478 | sunaddr->sun_path[0] = 0; | 1478 | sunaddr->sun_path[0] = 0; |
1479 | *uaddr_len = sizeof(short); | 1479 | err = sizeof(short); |
1480 | } else { | 1480 | } else { |
1481 | struct unix_address *addr = u->addr; | 1481 | struct unix_address *addr = u->addr; |
1482 | 1482 | ||
1483 | *uaddr_len = addr->len; | 1483 | err = addr->len; |
1484 | memcpy(sunaddr, addr->name, *uaddr_len); | 1484 | memcpy(sunaddr, addr->name, addr->len); |
1485 | } | 1485 | } |
1486 | unix_state_unlock(sk); | 1486 | unix_state_unlock(sk); |
1487 | sock_put(sk); | 1487 | sock_put(sk); |