| Message ID | 20210321002045.23700-1-pbl@bestov.io (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ipv4/raw: support binding to nonlocal addresses | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
On 3/20/21 6:20 PM, Riccardo Paolo Bestetti wrote: > diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c > index 50a73178d63a..734c0332b54b 100644 > --- a/net/ipv4/raw.c > +++ b/net/ipv4/raw.c > @@ -717,6 +717,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) > { > struct inet_sock *inet = inet_sk(sk); > struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; > + struct net *net = sock_net(sk); > u32 tb_id = RT_TABLE_LOCAL; > int ret = -EINVAL; > int chk_addr_ret; > @@ -732,7 +733,8 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) > tb_id); > > ret = -EADDRNOTAVAIL; > - if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && > + if (!inet_can_nonlocal_bind(net, inet) && > + addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && > chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) > goto out; > inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr; > Please add test cases to ipv4_addr_bind and ipv6_addr_bind in tools/testing/selftests/net/fcnal-test.sh. The latter will verify if IPv6 works the same or needs a change. Also, this check duplicates the ones in __inet_bind and __inet6_bind; it would be good to use an inline helper to reduce the duplication.
On Mon, 15 Nov 2021 00:09:44 +0100 Riccardo Paolo Bestetti wrote: > Add support to inet v4 raw sockets for binding to nonlocal addresses > through the IP_FREEBIND and IP_TRANSPARENT socket options, as well as > the ipv4.ip_nonlocal_bind kernel parameter. FWIW this patch did not make it to patchwork or any of the mailing lists. Not immediately obvious why. Can you try re-sending?
On Wed Nov 17, 2021 at 4:44 AM CET, Jakub Kicinski wrote: > On Mon, 15 Nov 2021 00:09:44 +0100 Riccardo Paolo Bestetti wrote: > > Add support to inet v4 raw sockets for binding to nonlocal addresses > > through the IP_FREEBIND and IP_TRANSPARENT socket options, as well as > > the ipv4.ip_nonlocal_bind kernel parameter. > > FWIW this patch did not make it to patchwork or any of the mailing > lists. Not immediately obvious why. Can you try re-sending? It did end up on patchwork[1] last time I sent it. At the time net-next was closed, so you asked me to send it again when it re-opened. I probably screwed up the message ID this time around. As of why it didn't end up on the mailing lists - I have no clue! They are definitely CC'd. I re-sent it. Hopefully everything worked this time! Riccardo [1] https://patchwork.kernel.org/project/netdevbpf/patch/20211102141921.197561-1-pbl@bestov.io/
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 50a73178d63a..734c0332b54b 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -717,6 +717,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) { struct inet_sock *inet = inet_sk(sk); struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; + struct net *net = sock_net(sk); u32 tb_id = RT_TABLE_LOCAL; int ret = -EINVAL; int chk_addr_ret; @@ -732,7 +733,8 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) tb_id); ret = -EADDRNOTAVAIL; - if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && + if (!inet_can_nonlocal_bind(net, inet) && + addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) goto out; inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
Add support to inet raw sockets for binding to nonlocal addresses through the IP_FREEBIND and IP_TRANSPARENT socket options, as well as the ipv4.ip_nonlocal_bind kernel parameter. Signed-off-by: Riccardo Paolo Bestetti <pbl@bestov.io> --- net/ipv4/raw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)