+ drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch added to -mm tree

+ drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch added to -mm tree

[akpm]

The patch titled
     Subject: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4
has been added to the -mm tree.  Its filename is
     drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4

gcc-4.4.4 has issues with initialization of anonymous unions.

drivers/infiniband/core/verbs.c: In function '__ib_drain_sq':
drivers/infiniband/core/verbs.c:2204: error: unknown field 'wr_cqe' specified in initializer
drivers/infiniband/core/verbs.c:2204: warning: initialization makes integer from pointer without a cast

Work around this.

Fixes: a1ae7d0345edd5 ("RDMA/core: Avoid that ib_drain_qp() triggers an out-of-bounds stack access")
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/core/verbs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/infiniband/core/verbs.c~drivers-infiniband-core-verbsc-fix-build-with-gcc-444 drivers/infiniband/core/verbs.c
--- a/drivers/infiniband/core/verbs.c~drivers-infiniband-core-verbsc-fix-build-with-gcc-444
+++ a/drivers/infiniband/core/verbs.c
@@ -2200,8 +2200,9 @@ static void __ib_drain_sq(struct ib_qp *
 	struct ib_send_wr *bad_swr;
 	struct ib_rdma_wr swr = {
 		.wr = {
+			.next = NULL,
+			{ .wr_cqe	= &sdrain.cqe, },
 			.opcode	= IB_WR_RDMA_WRITE,
-			.wr_cqe	= &sdrain.cqe,
 		},
 	};
 	int ret;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
hugetlbfs-check-for-pgoff-value-overflow-v3-fix.patch
mm-remove-unused-arg-from-memblock_next_valid_pfn.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-initialize-pages-on-demand-during-boot-v6-checkpatch-fixes.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
ipc-clamp-semmni-to-the-real-ipcmni-limit-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch

Re: + drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch added to -mm tree

[Jason Gunthorpe]

On Tue, Mar 13, 2018 at 02:51:21PM -0700, akpm@linux-foundation.org wrote:
> 
> The patch titled
>      Subject: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4
> has been added to the -mm tree.  Its filename is
>      drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
> 
> This patch should soon appear at
>     http://ozlabs.org/~akpm/mmots/broken-out/drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
> and later at
>     http://ozlabs.org/~akpm/mmotm/broken-out/drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch
> 
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
> 
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
> 
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
> 
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4
> 
> gcc-4.4.4 has issues with initialization of anonymous unions.
> 
> drivers/infiniband/core/verbs.c: In function '__ib_drain_sq':
> drivers/infiniband/core/verbs.c:2204: error: unknown field 'wr_cqe' specified in initializer
> drivers/infiniband/core/verbs.c:2204: warning: initialization makes integer from pointer without a cast
> 
> Work around this.
> 
> Fixes: a1ae7d0345edd5 ("RDMA/core: Avoid that ib_drain_qp() triggers an out-of-bounds stack access")
> Cc: Bart Van Assche <bart.vanassche@wdc.com>
> Cc: Steve Wise <swise@opengridcomputing.com>
> Cc: Sagi Grimberg <sagi@grimberg.me>
> Cc: Jason Gunthorpe <jgg@mellanox.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
>  drivers/infiniband/core/verbs.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff -puN drivers/infiniband/core/verbs.c~drivers-infiniband-core-verbsc-fix-build-with-gcc-444 drivers/infiniband/core/verbs.c
> +++ a/drivers/infiniband/core/verbs.c
> @@ -2200,8 +2200,9 @@ static void __ib_drain_sq(struct ib_qp *
>  	struct ib_send_wr *bad_swr;
>  	struct ib_rdma_wr swr = {
>  		.wr = {
> +			.next = NULL,
> +			{ .wr_cqe	= &sdrain.cqe, },
>  			.opcode	= IB_WR_RDMA_WRITE,
> -			.wr_cqe	= &sdrain.cqe,
>  		},
>  	};
>  	int ret;
> _
>

There were two patches in the series that introduced this, and the
same construct was also added in 2a78cb4db487 ("IB/srpt: Fix an
out-of-bounds stack access in srpt_zerolength_write()")

We should probably fix both??

Should this go through the rdma -rc tree?

Thanks,
Jason

Re: + drivers-infiniband-core-verbsc-fix-build-with-gcc-444.patch added to -mm tree

[Andrew Morton]

On Tue, 13 Mar 2018 16:01:23 -0600 Jason Gunthorpe <jgg@mellanox.com> wrote:

> > diff -puN drivers/infiniband/core/verbs.c~drivers-infiniband-core-verbsc-fix-build-with-gcc-444 drivers/infiniband/core/verbs.c
> > +++ a/drivers/infiniband/core/verbs.c
> > @@ -2200,8 +2200,9 @@ static void __ib_drain_sq(struct ib_qp *
> >  	struct ib_send_wr *bad_swr;
> >  	struct ib_rdma_wr swr = {
> >  		.wr = {
> > +			.next = NULL,
> > +			{ .wr_cqe	= &sdrain.cqe, },
> >  			.opcode	= IB_WR_RDMA_WRITE,
> > -			.wr_cqe	= &sdrain.cqe,
> >  		},
> >  	};
> >  	int ret;
> > _
> >
> 
> There were two patches in the series that introduced this, and the
> same construct was also added in 2a78cb4db487 ("IB/srpt: Fix an
> out-of-bounds stack access in srpt_zerolength_write()")
> 
> We should probably fix both??

yup.  Sent.

> Should this go through the rdma -rc tree?

Via whichever tree contained the Fixes: commits, I guess.