2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index cfaa56ada189..7151a02b4ebb 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -940,7 +940,6 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
                 if (!mm2)
                         goto err4;
 
-                memset(&uresp, 0, sizeof(uresp));
                 uresp.qid_mask = rhp->rdev.cqmask;
                 uresp.cqid = chp->cq.cqid;
                 uresp.size = chp->cq.size;
@@ -951,7 +950,8 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
                 uresp.gts_key = ucontext->key;
                 ucontext->key += PAGE_SIZE;
                 spin_unlock(&ucontext->mmap_lock);
-                ret = ib_copy_to_udata(udata, &uresp, sizeof uresp);
+                ret = ib_copy_to_udata(udata, &uresp,
+                                       sizeof(uresp) - sizeof(uresp.reserved));
                 if (ret)
                         goto err5;
 
diff --git a/drivers/infiniband/hw/cxgb4/user.h b/drivers/infiniband/hw/cxgb4/user.h
index 11ccd276e5d9..9b7534b5f07d 100644
--- a/drivers/infiniband/hw/cxgb4/user.h
+++ b/drivers/infiniband/hw/cxgb4/user.h
@@ -48,6 +48,7 @@ struct c4iw_create_cq_resp {
         __u32 cqid;
         __u32 size;
         __u32 qid_mask;
+        __u32 reserved; /* explicit padding (optional for i386) */
 };