lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 13 May 2020 08:26:34 +0200 From: Christoph Hellwig <hch@....de> To: "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org> Cc: Eric Dumazet <edumazet@...gle.com>, Alexey Kuznetsov <kuznet@....inr.ac.ru>, Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>, Vlad Yasevich <vyasevich@...il.com>, Neil Horman <nhorman@...driver.com>, Marcelo Ricardo Leitner <marcelo.leitner@...il.com>, Jon Maloy <jmaloy@...hat.com>, Ying Xue <ying.xue@...driver.com>, drbd-dev@...ts.linbit.com, linux-block@...r.kernel.org, linux-kernel@...r.kernel.org, linux-rdma@...r.kernel.org, linux-nvme@...ts.infradead.org, target-devel@...r.kernel.org, linux-afs@...ts.infradead.org, linux-cifs@...r.kernel.org, cluster-devel@...hat.com, ocfs2-devel@....oracle.com, netdev@...r.kernel.org, linux-sctp@...r.kernel.org, ceph-devel@...r.kernel.org, rds-devel@....oracle.com, linux-nfs@...r.kernel.org Subject: [PATCH 19/33] ipv4: add ip_sock_set_freebind Add a helper to directly set the IP_FREEBIND sockopt from kernel space without going through a fake uaccess. Signed-off-by: Christoph Hellwig <hch@....de> --- drivers/target/iscsi/iscsi_target_login.c | 13 +++---------- include/net/ip.h | 1 + net/ipv4/ip_sockglue.c | 8 ++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 165fa573bcb29..9f69e16cfef5f 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c @@ -15,6 +15,7 @@ #include <linux/sched/signal.h> #include <linux/idr.h> #include <linux/tcp.h> /* TCP_NODELAY */ +#include <net/ip.h> #include <net/ipv6.h> /* ipv6_addr_v4mapped() */ #include <scsi/iscsi_proto.h> #include <target/target_core_base.h> @@ -855,7 +856,7 @@ int iscsit_setup_np( struct sockaddr_storage *sockaddr) { struct socket *sock = NULL; - int backlog = ISCSIT_TCP_BACKLOG, ret, opt = 0, len; + int backlog = ISCSIT_TCP_BACKLOG, ret, len; switch (np->np_network_transport) { case ISCSI_TCP: @@ -900,15 +901,7 @@ int iscsit_setup_np( if (np->np_network_transport == ISCSI_TCP) tcp_sock_set_nodelay(sock->sk, true); sock_set_reuseaddr(sock->sk, SK_CAN_REUSE); - - opt = 1; - ret = kernel_setsockopt(sock, IPPROTO_IP, IP_FREEBIND, - (char *)&opt, sizeof(opt)); - if (ret < 0) { - pr_err("kernel_setsockopt() for IP_FREEBIND" - " failed\n"); - goto fail; - } + ip_sock_set_freebind(sock->sk, true); ret = kernel_bind(sock, (struct sockaddr *)&np->np_sockaddr, len); if (ret < 0) { diff --git a/include/net/ip.h b/include/net/ip.h index 2fc52e26fa88b..1e2feca8630d0 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -766,5 +766,6 @@ static inline bool inetdev_valid_mtu(unsigned int mtu) } void ip_sock_set_tos(struct sock *sk, int val); +void ip_sock_set_freebind(struct sock *sk, bool val); #endif /* _IP_H */ diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 1733ac78c21aa..0c40887a817f8 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -581,6 +581,14 @@ void ip_sock_set_tos(struct sock *sk, int val) } EXPORT_SYMBOL(ip_sock_set_tos); +void ip_sock_set_freebind(struct sock *sk, bool val) +{ + lock_sock(sk); + inet_sk(sk)->freebind = val; + release_sock(sk); +} +EXPORT_SYMBOL(ip_sock_set_freebind); + /* * Socket option code for IP. This is the end of the line after any * TCP,UDP etc options on an IP socket. -- 2.26.2
Powered by blists - more mailing lists