Commit 9b2c45d4 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by David S. Miller
Browse files

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: default avatarDenys 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 7928b2cb

drivers/infiniband/hw/usnic/usnic_transport.c

+2 −3
Original line number Diff line number Diff line
@@ -174,14 +174,13 @@ void usnic_transport_put_socket(struct socket *sock) 
int usnic_transport_sock_get_addr(struct socket *sock, int *proto,

					uint32_t *addr, uint16_t *port)

{

	int len;

	int err;

	struct sockaddr_in sock_addr;



	err = sock->ops->getname(sock,

				(struct sockaddr *)&sock_addr,

				&len, 0);

	if (err)

				0);

	if (err < 0)

		return err;



	if (sock_addr.sin_family != AF_INET)

drivers/isdn/mISDN/socket.c

+2 −3
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ done: 


static int

data_sock_getname(struct socket *sock, struct sockaddr *addr,

		  int *addr_len, int peer)

		  int peer)

{

	struct sockaddr_mISDN	*maddr = (struct sockaddr_mISDN *) addr;

	struct sock		*sk = sock->sk;
@@ -570,14 +570,13 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr, 


	lock_sock(sk);



	*addr_len = sizeof(*maddr);

	maddr->family = AF_ISDN;

	maddr->dev = _pms(sk)->dev->id;

	maddr->channel = _pms(sk)->ch.nr;

	maddr->sapi = _pms(sk)->ch.addr & 0xff;

	maddr->tei = (_pms(sk)->ch.addr >> 8) & 0xff;

	release_sock(sk);

	return 0;

	return sizeof(*maddr);

}



static const struct proto_ops data_sock_ops = {

drivers/net/ppp/pppoe.c

+2 −4
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ err_put: 
}



static int pppoe_getname(struct socket *sock, struct sockaddr *uaddr,

		  int *usockaddr_len, int peer)

		  int peer)

{

	int len = sizeof(struct sockaddr_pppox);

	struct sockaddr_pppox sp;
@@ -726,9 +726,7 @@ static int pppoe_getname(struct socket *sock, struct sockaddr *uaddr, 


	memcpy(uaddr, &sp, len);



	*usockaddr_len = len;



	return 0;

	return len;

}



static int pppoe_ioctl(struct socket *sock, unsigned int cmd,

drivers/net/ppp/pptp.c

+2 −4
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, 
}



static int pptp_getname(struct socket *sock, struct sockaddr *uaddr,

	int *usockaddr_len, int peer)

	int peer)

{

	int len = sizeof(struct sockaddr_pppox);

	struct sockaddr_pppox sp;
@@ -496,9 +496,7 @@ static int pptp_getname(struct socket *sock, struct sockaddr *uaddr, 


	memcpy(uaddr, &sp, len);



	*usockaddr_len = len;



	return 0;

	return len;

}



static int pptp_release(struct socket *sock)

drivers/scsi/iscsi_tcp.c

+7 −7
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int iscsi_sw_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn, 
	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;

	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;

	struct sockaddr_in6 addr;

	int rc, len;

	int rc;



	switch(param) {

	case ISCSI_PARAM_CONN_PORT:
@@ -745,12 +745,12 @@ static int iscsi_sw_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn, 
		}

		if (param == ISCSI_PARAM_LOCAL_PORT)

			rc = kernel_getsockname(tcp_sw_conn->sock,

						(struct sockaddr *)&addr, &len);

						(struct sockaddr *)&addr);

		else

			rc = kernel_getpeername(tcp_sw_conn->sock,

						(struct sockaddr *)&addr, &len);

						(struct sockaddr *)&addr);

		spin_unlock_bh(&conn->session->frwd_lock);

		if (rc)

		if (rc < 0)

			return rc;



		return iscsi_conn_get_addr_param((struct sockaddr_storage *)
@@ -771,7 +771,7 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost, 
	struct iscsi_tcp_conn *tcp_conn;

	struct iscsi_sw_tcp_conn *tcp_sw_conn;

	struct sockaddr_in6 addr;

	int rc, len;

	int rc;



	switch (param) {

	case ISCSI_HOST_PARAM_IPADDRESS:
@@ -793,9 +793,9 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost, 
		}



		rc = kernel_getsockname(tcp_sw_conn->sock,

					(struct sockaddr *)&addr, &len);

					(struct sockaddr *)&addr);

		spin_unlock_bh(&session->frwd_lock);

		if (rc)

		if (rc < 0)

			return rc;



		return iscsi_conn_get_addr_param((struct sockaddr_storage *)

CRA Git | Maintained and supported by SUSTech CRA and CCSE