2019-01-10 06:29:34

by Myungho Jung

Subject: [PATCH v2] RDMA/cma: Rollback source IP address if failing to acquire device

If cma_acquire_dev_by_src_ip() returns error in addr_handler(), the
device state changes back to RDMA_CM_ADDR_BOUND but the resolved source
IP address is still left. After that, if rdma_destroy_id() is called
after rdma_listen(), the device is freed without removed from
listen_any_list in cma_cancel_operation(). Revert to the previous IP
address if acquiring device fails.

Reported-by: [email protected]
Signed-off-by: Myungho Jung <[email protected]>
---
drivers/infiniband/core/cma.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 63a7cc00bae0..8cd113b0ddfb 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2963,13 +2963,22 @@ static void addr_handler(int status, struct sockaddr *src_addr,
{
struct rdma_id_private *id_priv = context;
struct rdma_cm_event event = {};
+ struct sockaddr *addr;
+ struct sockaddr_storage old_addr;

mutex_lock(&id_priv->handler_mutex);
if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_QUERY,
RDMA_CM_ADDR_RESOLVED))
goto out;

- memcpy(cma_src_addr(id_priv), src_addr, rdma_addr_size(src_addr));
+ /*
+ * Store the previous src address, so that if we fail to acquire
+ * matching rdma device, old address can be restored back, which helps
+ * to cancel the cma listen operation correctly.
+ */
+ addr = cma_src_addr(id_priv);
+ memcpy(&old_addr, addr, rdma_addr_size(addr));
+ memcpy(addr, src_addr, rdma_addr_size(src_addr));
if (!status && !id_priv->cma_dev) {
status = cma_acquire_dev_by_src_ip(id_priv);
if (status)
@@ -2980,6 +2989,8 @@ static void addr_handler(int status, struct sockaddr *src_addr,
}

if (status) {
+ memcpy(addr, &old_addr,
+ rdma_addr_size((struct sockaddr *)&old_addr));
if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_RESOLVED,
RDMA_CM_ADDR_BOUND))
goto out;
--
2.17.1

2019-01-14 22:22:07

by Parav Pandit

Subject: RE: [PATCH v2] RDMA/cma: Rollback source IP address if failing to acquire device

> -----Original Message-----
> From: Myungho Jung <[email protected]>
> Sent: Thursday, January 10, 2019 12:28 AM
> To: Doug Ledford <[email protected]>; Jason Gunthorpe <[email protected]>;
> Parav Pandit <[email protected]>
> Cc: [email protected]; [email protected]
> Subject: [PATCH v2] RDMA/cma: Rollback source IP address if failing to
> acquire device
>
> If cma_acquire_dev_by_src_ip() returns error in addr_handler(), the device
> state changes back to RDMA_CM_ADDR_BOUND but the resolved source IP
> address is still left. After that, if rdma_destroy_id() is called after
> rdma_listen(), the device is freed without removed from listen_any_list in
> cma_cancel_operation(). Revert to the previous IP address if acquiring device
> fails.
>
> Reported-by: [email protected]
> Signed-off-by: Myungho Jung <[email protected]>
> ---
> drivers/infiniband/core/cma.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index 63a7cc00bae0..8cd113b0ddfb 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -2963,13 +2963,22 @@ static void addr_handler(int status, struct
> sockaddr *src_addr, {
> struct rdma_id_private *id_priv = context;
> struct rdma_cm_event event = {};
> + struct sockaddr *addr;
> + struct sockaddr_storage old_addr;
>
> mutex_lock(&id_priv->handler_mutex);
> if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_QUERY,
> RDMA_CM_ADDR_RESOLVED))
> goto out;
>
> - memcpy(cma_src_addr(id_priv), src_addr,
> rdma_addr_size(src_addr));
> + /*
> + * Store the previous src address, so that if we fail to acquire
> + * matching rdma device, old address can be restored back, which
> helps
> + * to cancel the cma listen operation correctly.
> + */
> + addr = cma_src_addr(id_priv);
> + memcpy(&old_addr, addr, rdma_addr_size(addr));
> + memcpy(addr, src_addr, rdma_addr_size(src_addr));
> if (!status && !id_priv->cma_dev) {
> status = cma_acquire_dev_by_src_ip(id_priv);
> if (status)
> @@ -2980,6 +2989,8 @@ static void addr_handler(int status, struct sockaddr
> *src_addr,
> }
>
> if (status) {
> + memcpy(addr, &old_addr,
> + rdma_addr_size((struct sockaddr *)&old_addr));
> if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_RESOLVED,
> RDMA_CM_ADDR_BOUND))
> goto out;
> --
> 2.17.1
Reviewed-by: Parav Pandit <[email protected]>

2019-01-14 22:30:16

by Jason Gunthorpe

Subject: Re: [PATCH v2] RDMA/cma: Rollback source IP address if failing to acquire device

On Wed, Jan 09, 2019 at 10:27:31PM -0800, Myungho Jung wrote:
> If cma_acquire_dev_by_src_ip() returns error in addr_handler(), the
> device state changes back to RDMA_CM_ADDR_BOUND but the resolved source
> IP address is still left. After that, if rdma_destroy_id() is called
> after rdma_listen(), the device is freed without removed from
> listen_any_list in cma_cancel_operation(). Revert to the previous IP
> address if acquiring device fails.
>
> Reported-by: [email protected]
> Signed-off-by: Myungho Jung <[email protected]>
> Reviewed-by: Parav Pandit <[email protected]>
> ---
> drivers/infiniband/core/cma.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)

Applied to for-next, thanks

Jason