| Message ID | 20151011204603.GA14646@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 10/11/15 1:46 PM, Sowmini Varadhan wrote: > > The IP address passed to rds_bind() should be vetted by the > transport's ->laddr_check() for a previously bound transport. > This needs to be done to avoid cases where, for example, > the application has asked for an IB transport, > but the IP address passed to bind is only usable on > ethernet interfaces. > Right. Probably it should go into stable as well. > Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> > --- > net/rds/bind.c | 9 ++++++++- > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/net/rds/bind.c b/net/rds/bind.c > index bc6b93e..6192566 100644 > --- a/net/rds/bind.c > +++ b/net/rds/bind.c > @@ -196,7 +196,14 @@ int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) > goto out; > > if (rs->rs_transport) { /* previously bound */ > - ret = 0; Minor comment. If you retain above line you can drop the below else. > + trans = rs->rs_transport; > + if (trans->laddr_check(sock_net(sock->sk), > + sin->sin_addr.s_addr) != 0) { > + ret = -ENOPROTOOPT; > + rds_remove_bound(rs); > + } else { > + ret = 0; > + } Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.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: Sowmini Varadhan <sowmini.varadhan@oracle.com> Date: Sun, 11 Oct 2015 16:46:03 -0400 > The IP address passed to rds_bind() should be vetted by the > transport's ->laddr_check() for a previously bound transport. > This needs to be done to avoid cases where, for example, > the application has asked for an IB transport, > but the IP address passed to bind is only usable on > ethernet interfaces. > > Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.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/rds/bind.c b/net/rds/bind.c index bc6b93e..6192566 100644 --- a/net/rds/bind.c +++ b/net/rds/bind.c @@ -196,7 +196,14 @@ int rds_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) goto out; if (rs->rs_transport) { /* previously bound */ - ret = 0; + trans = rs->rs_transport; + if (trans->laddr_check(sock_net(sock->sk), + sin->sin_addr.s_addr) != 0) { + ret = -ENOPROTOOPT; + rds_remove_bound(rs); + } else { + ret = 0; + } goto out; } trans = rds_trans_get_preferred(sock_net(sock->sk),
The IP address passed to rds_bind() should be vetted by the transport's ->laddr_check() for a previously bound transport. This needs to be done to avoid cases where, for example, the application has asked for an IB transport, but the IP address passed to bind is only usable on ethernet interfaces. Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> --- net/rds/bind.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)