summaryrefslogtreecommitdiffstats
path: root/net/can
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/can
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/can')
-rw-r--r--net/can/raw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index f2ecc43376a1..1051eee82581 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -470,7 +470,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
470} 470}
471 471
472static int raw_getname(struct socket *sock, struct sockaddr *uaddr, 472static int raw_getname(struct socket *sock, struct sockaddr *uaddr,
473 int *len, int peer) 473 int peer)
474{ 474{
475 struct sockaddr_can *addr = (struct sockaddr_can *)uaddr; 475 struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
476 struct sock *sk = sock->sk; 476 struct sock *sk = sock->sk;
@@ -483,9 +483,7 @@ static int raw_getname(struct socket *sock, struct sockaddr *uaddr,
483 addr->can_family = AF_CAN; 483 addr->can_family = AF_CAN;
484 addr->can_ifindex = ro->ifindex; 484 addr->can_ifindex = ro->ifindex;
485 485
486 *len = sizeof(*addr); 486 return sizeof(*addr);
487
488 return 0;
489} 487}
490 488
491static int raw_setsockopt(struct socket *sock, int level, int optname, 489static int raw_setsockopt(struct socket *sock, int level, int optname,