RDS: RDMA: Fix the NULL-ptr deref in rds_ib_get_mr

[sfrench/cifs-2.6.git] / net / rds / rds.h

diff --git a/net/rds/rds.h b/net/rds/rds.h
index f2272fb8cd456e7b5bb2495d5d02691803c3769f..60b3b787fbdb321ca3a280314c18443890ed78c3 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -464,6 +464,8 @@ struct rds_message {
                        struct scatterlist      *op_sg;
                } data;
        };
+
+       struct rds_conn_path *m_conn_path;
 };
 
 /*
@@ -544,7 +546,8 @@ struct rds_transport {
                                        unsigned int avail);
        void (*exit)(void);
        void *(*get_mr)(struct scatterlist *sg, unsigned long nr_sg,
-                       struct rds_sock *rs, u32 *key_ret);
+                       struct rds_sock *rs, u32 *key_ret,
+                       struct rds_connection *conn);
        void (*sync_mr)(void *trans_private, int direction);
        void (*free_mr)(void *trans_private, int invalidate);
        void (*flush_mrs)(void);