linux-decnet-user — Discussion for users of DECnet on Linux

Re: [Linux-decnet-user] [PATCH net] dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock

[David M. <da...@da...>]

From: Paolo Abeni <pa...@re...>
Date: Thu, 15 Feb 2018 16:59:49 +0100

> After commit 3f34cfae1238 ("netfilter: on sockopt() acquire sock lock
> only in the required scope"), the caller of nf_{get/set}sockopt() must
> not hold any lock, but, in such changeset, I forgot to cope with DECnet.
> 
> This commit addresses the issue moving the nf call outside the lock,
> in the dn_{get,set}sockopt() with the same schema currently used by
> ipv4 and ipv6. Also moves the unhandled sockopts of the end of the main
> switch statements, to improve code readability.
> 
> Reported-by: Petr Vandrovec <pe...@va...>
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=198791#c2
> Fixes: 3f34cfae1238 ("netfilter: on sockopt() acquire sock lock only in the required scope")
> Signed-off-by: Paolo Abeni <pa...@re...>

Applied, thank you.

Re: [Linux-decnet-user] [PATCH v2] net: make getname() functions return length rather than use int* parameter

[David M. <da...@da...>]

From: Denys Vlasenko <dvl...@re...>
Date: Mon, 12 Feb 2018 20:00:20 +0100

> 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 <dvl...@re...>

Applied to net-next, thanks Denys.

Re: [Linux-decnet-user] [PATCH] net: make getname() functions return length rather than use int* parameter

[David M. <da...@da...>]

From: Denys Vlasenko <dvl...@re...>
Date: Mon, 12 Feb 2018 15:15:18 +0100

> 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 <dvl...@re...>

Please do an allmodconfig build, there are still some conversions you
missed:

security/tomoyo/network.c: In function ‘tomoyo_socket_listen_permission’:
security/tomoyo/network.c:658:19: warning: passing argument 3 of ‘sock->ops->getname’ makes integer from pointer without a cast [-Wint-conversion]
            &addr, &addr_len, 0);
                   ^
security/tomoyo/network.c:658:19: note: expected ‘int’ but argument is of type ‘int *’
security/tomoyo/network.c:657:21: error: too many arguments to function ‘sock->ops->getname’
   const int error = sock->ops->getname(sock, (struct sockaddr *)
                     ^~~~
fs/dlm/lowcomms.c: In function ‘lowcomms_error_report’:
fs/dlm/lowcomms.c:495:6: error: too many arguments to function ‘kernel_getpeername’
      kernel_getpeername(con->sock, (struct sockaddr *)&saddr, &buflen)) {
      ^~~~~~~~~~~~~~~~~~
fs/dlm/lowcomms.c: In function ‘tcp_accept_from_sock’:
fs/dlm/lowcomms.c:761:7: warning: passing argument 3 of ‘newsock->ops->getname’ makes integer from pointer without a cast [-Wint-conversion]
       &len, 2)) {
       ^
fs/dlm/lowcomms.c:761:7: note: expected ‘int’ but argument is of type ‘int *’
fs/dlm/lowcomms.c:760:6: error: too many arguments to function ‘newsock->ops->getname’
  if (newsock->ops->getname(newsock, (struct sockaddr *)&peeraddr,
      ^~~~~~~