2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 52caa2edf5a4..898f996513f8 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1320,6 +1320,10 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         struct ib_reth *reth;
         int header_in_data;
 
+        /* Validate the SLID. See Ch. 9.6.1.5 */
+        if (unlikely(be16_to_cpu(hdr->lrh[3]) != qp->remote_ah_attr.dlid))
+                goto done;
+
         /* Check for GRH */
         if (!has_grh) {
                 ohdr = &hdr->u.oth;
diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c
index 0fd3cded16ba..d550b7aedb8d 100644
--- a/drivers/infiniband/hw/ipath/ipath_uc.c
+++ b/drivers/infiniband/hw/ipath/ipath_uc.c
@@ -246,6 +246,10 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         struct ib_reth *reth;
         int header_in_data;
 
+        /* Validate the SLID. See Ch. 9.6.1.5 */
+        if (unlikely(be16_to_cpu(hdr->lrh[3]) != qp->remote_ah_attr.dlid))
+                goto done;
+
         /* Check for GRH */
         if (!has_grh) {
                 ohdr = &hdr->u.oth;