| Message ID | 1327516492-9045-1-git-send-email-fbl@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 01/25/2012 04:34 PM, Flavio Leitner wrote: > The current code checks for conflicts when the application > requests a specific port. If there is no conflict, then > the request is granted. > > On the other hand, the port autoselection done by the kernel > fails when all ports are bound even when there is a port > with no conflict available. > > The fix changes port autoselection to check if there is a > conflict and use it if not. > > Signed-off-by: Flavio Leitner<fbl@redhat.com> Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le mercredi 25 janvier 2012 à 16:34 -0200, Flavio Leitner a écrit : > The current code checks for conflicts when the application > requests a specific port. If there is no conflict, then > the request is granted. > > On the other hand, the port autoselection done by the kernel > fails when all ports are bound even when there is a port > with no conflict available. > > The fix changes port autoselection to check if there is a > conflict and use it if not. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> > --- > net/ipv4/inet_connection_sock.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c > index 2e4e244..ecd19b5 100644 > --- a/net/ipv4/inet_connection_sock.c > +++ b/net/ipv4/inet_connection_sock.c > @@ -128,6 +128,11 @@ again: > goto have_snum; > } > } > + if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { > + spin_unlock(&head->lock); > + snum = rover; > + goto have_snum; > + } > goto next; > } > break; Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Flavio Leitner <fbl@redhat.com> Date: Wed, 25 Jan 2012 16:34:51 -0200 > The current code checks for conflicts when the application > requests a specific port. If there is no conflict, then > the request is granted. > > On the other hand, the port autoselection done by the kernel > fails when all ports are bound even when there is a port > with no conflict available. > > The fix changes port autoselection to check if there is a > conflict and use it if not. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 2e4e244..ecd19b5 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -128,6 +128,11 @@ again: goto have_snum; } } + if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { + spin_unlock(&head->lock); + snum = rover; + goto have_snum; + } goto next; } break;
The current code checks for conflicts when the application requests a specific port. If there is no conflict, then the request is granted. On the other hand, the port autoselection done by the kernel fails when all ports are bound even when there is a port with no conflict available. The fix changes port autoselection to check if there is a conflict and use it if not. Signed-off-by: Flavio Leitner <fbl@redhat.com> --- net/ipv4/inet_connection_sock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)