2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index a94a3e12c349..c777e22bd8d5 100644
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -122,7 +122,7 @@ static struct ib_ucontext *c4iw_alloc_ucontext(struct ib_device *ibdev,
         INIT_LIST_HEAD(&context->mmaps);
         spin_lock_init(&context->mmap_lock);
 
-        if (udata->outlen < sizeof(uresp)) {
+        if (udata->outlen < sizeof(uresp) - sizeof(uresp.reserved)) {
                 if (!warned++)
                         pr_err(MOD "Warning - downlevel libcxgb4 (non-fatal), device status page disabled.");
                 rhp->rdev.flags |= T4_STATUS_PAGE_DISABLED;
@@ -140,7 +140,8 @@ static struct ib_ucontext *c4iw_alloc_ucontext(struct ib_device *ibdev,
                 context->key += PAGE_SIZE;
                 spin_unlock(&context->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 err_mm;
 
diff --git a/drivers/infiniband/hw/cxgb4/user.h b/drivers/infiniband/hw/cxgb4/user.h
index 9b7534b5f07d..cbd0ce170728 100644
--- a/drivers/infiniband/hw/cxgb4/user.h
+++ b/drivers/infiniband/hw/cxgb4/user.h
@@ -75,5 +75,6 @@ struct c4iw_create_qp_resp {
 struct c4iw_alloc_ucontext_resp {
         __u64 status_page_key;
         __u32 status_page_size;
+        __u32 reserved; /* explicit padding (optional for i386) */
 };
 #endif