aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2018-02-12 14:00:20 -0500
committerDavid S. Miller <davem@davemloft.net>2018-02-12 14:15:04 -0500
commit9b2c45d479d0fb8647c9e83359df69162b5fbe5f (patch)
tree1004b2ce427a21084ff723b29026da6f263fc96b /net/unix/af_unix.c
parent7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff)
net: make getname() functions return length rather than use int* parameter
Changes since v1: Added changes in these files: drivers/infiniband/hw/usnic/usnic_transport.c drivers/staging/lustre/lnet/lnet/lib-socket.c drivers/target/iscsi/iscsi_target_login.c drivers/vhost/net.c fs/dlm/lowcomms.c fs/ocfs2/cluster/tcp.c security/tomoyo/network.c Before: All these functions either return a negative error indicator, or store length of sockaddr into "int *socklen" parameter and return zero on success. "int *socklen" parameter is awkward. For example, if caller does not care, it still needs to provide on-stack storage for the value it does not need. None of the many FOO_getname() functions of various protocols ever used old value of *socklen. They always just overwrite it. This change drops this parameter, and makes all these functions, on success, return length of sockaddr. It's always >= 0 and can be differentiated from an error. Tests in callers are changed from "if (err)" to "if (err < 0)", where needed. rpc_sockname() lost "int buflen" parameter, since its only use was to be passed to kernel_getsockname() as &buflen and subsequently not used in any way. Userspace API is not changed. text data bss dec hex filename 30108430 2633624 873672 33615726 200ef6e vmlinux.before.o 30108109 2633612 873672 33615393 200ee21 vmlinux.o Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> CC: David S. Miller <davem@davemloft.net> CC: linux-kernel@vger.kernel.org CC: netdev@vger.kernel.org CC: linux-bluetooth@vger.kernel.org CC: linux-decnet-user@lists.sourceforge.net CC: linux-wireless@vger.kernel.org CC: linux-rdma@vger.kernel.org CC: linux-sctp@vger.kernel.org CC: linux-nfs@vger.kernel.org CC: linux-x25@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c10
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);
638static int unix_socketpair(struct socket *, struct socket *); 638static int unix_socketpair(struct socket *, struct socket *);
639static int unix_accept(struct socket *, struct socket *, int, bool); 639static int unix_accept(struct socket *, struct socket *, int, bool);
640static int unix_getname(struct socket *, struct sockaddr *, int *, int); 640static int unix_getname(struct socket *, struct sockaddr *, int);
641static __poll_t unix_poll(struct file *, struct socket *, poll_table *); 641static __poll_t unix_poll(struct file *, struct socket *, poll_table *);
642static __poll_t unix_dgram_poll(struct file *, struct socket *, 642static __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
1456static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer) 1456static 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);