Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2017-01-27 12:38:00 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2017-01-27 12:58:28 +0100
commitbf38d921b0b74935d6fc043c3b8c393f63db7208 (patch)
tree42af4efe3a4d2d7a73c59d9e13d2a7b1200a2c9d
parent00f9dbeffbdd08b84e6d9e5f118f585d7f7a0666 (diff)
- IB/rxe: Don't check for null ptr in send() (FATE#322149).rpm-4.4.44-1
- Update config files. - supported.conf: Add rxe to the list of supported modules
-rw-r--r--config/arm64/default1
-rw-r--r--config/ppc64le/debug1
-rw-r--r--config/ppc64le/default1
-rw-r--r--config/s390x/default1
-rw-r--r--config/x86_64/debug1
-rw-r--r--config/x86_64/default1
-rw-r--r--patches.drivers/0037-IB-rxe-Don-t-check-for-null-ptr-in-send.patch39
-rw-r--r--series.conf1
-rw-r--r--supported.conf1
9 files changed, 47 insertions, 0 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 78af0cdfc9..406889498b 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -5388,6 +5388,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
CONFIG_EDAC_LEGACY_SYSFS=y
diff --git a/config/ppc64le/debug b/config/ppc64le/debug
index 21659ad43a..95f112bb5a 100644
--- a/config/ppc64le/debug
+++ b/config/ppc64le/debug
@@ -3771,6 +3771,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_RDMAVT=m
+# CONFIG_RDMA_RXE is not set
CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 685568e42b..efd09236de 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -3762,6 +3762,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_RDMAVT=m
+# CONFIG_RDMA_RXE is not set
CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
diff --git a/config/s390x/default b/config/s390x/default
index c32fee3f37..73e6540d1e 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1905,6 +1905,7 @@ CONFIG_MLX5_INFINIBAND=m
# CONFIG_INFINIBAND_ISER is not set
# CONFIG_INFINIBAND_ISERT is not set
CONFIG_INFINIBAND_RDMAVT=m
+# CONFIG_RDMA_RXE is not set
# CONFIG_DMADEVICES is not set
CONFIG_AUXDISPLAY=y
# CONFIG_UIO is not set
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 496f0688d8..90af875b42 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -5608,6 +5608,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
diff --git a/config/x86_64/default b/config/x86_64/default
index 424ebe16df..a94e664738 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -5597,6 +5597,7 @@ CONFIG_INFINIBAND_SRPT=m
CONFIG_INFINIBAND_ISER=m
CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
diff --git a/patches.drivers/0037-IB-rxe-Don-t-check-for-null-ptr-in-send.patch b/patches.drivers/0037-IB-rxe-Don-t-check-for-null-ptr-in-send.patch
new file mode 100644
index 0000000000..56543943b9
--- /dev/null
+++ b/patches.drivers/0037-IB-rxe-Don-t-check-for-null-ptr-in-send.patch
@@ -0,0 +1,39 @@
+From e016f37a9f0d339c9019ea5483b1e52398017ab2 Mon Sep 17 00:00:00 2001
+From: Andrew Boyer <andrew.boyer@dell.com>
+Date: Thu, 22 Dec 2016 08:54:38 -0500
+Subject: IB/rxe: Don't check for null ptr in send()
+Git-commit: 5cc8fabc5e4c588c75a5ec21423e7c3425f69f48
+Patch-mainline: v4.10-rc1
+References: FATE#322149
+
+pkt->qp was already dereferenced earlier in the function.
+
+Fixes Smatch complaint:
+drivers/infiniband/sw/rxe/rxe_net.c:458 send()
+ warn: variable dereferenced before check 'pkt->qp' (see line 441)
+
+Signed-off-by: Andrew Boyer <andrew.boyer@dell.com>
+Signed-off-by: Doug Ledford <dledford@redhat.com>
+Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
+
+---
+ drivers/infiniband/sw/rxe/rxe_net.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
+index 16967cd..342e781 100644
+--- a/drivers/infiniband/sw/rxe/rxe_net.c
++++ b/drivers/infiniband/sw/rxe/rxe_net.c
+@@ -455,8 +455,7 @@ static int send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
+ return -EAGAIN;
+ }
+
+- if (pkt->qp)
+- atomic_inc(&pkt->qp->skb_out);
++ atomic_inc(&pkt->qp->skb_out);
+ kfree_skb(skb);
+
+ return 0;
+--
+1.8.5.6
+
diff --git a/series.conf b/series.conf
index 25719e1e93..1dead0730f 100644
--- a/series.conf
+++ b/series.conf
@@ -5379,6 +5379,7 @@
patches.drivers/0034-IB-rxe-Fix-a-memory-leak-in-rxe_qp_cleanup.patch
patches.drivers/0035-IB-rxe-Use-BTH_PSN_MASK-when-ACKing-duplicate-sends.patch
patches.drivers/0036-IB-rxe-Drop-future-atomic-read-packets-rather-than-r.patch
+ patches.drivers/0037-IB-rxe-Don-t-check-for-null-ptr-in-send.patch
# fate#322061 Hisilicon/Huawei Hip06d05 network
patches.drivers/arm64-hip-0001-net-hns-Add-support-of-Hip06-SoC-to-the-Hislicon-Net.patch
diff --git a/supported.conf b/supported.conf
index c8b3940fca..82e64c3b24 100644
--- a/supported.conf
+++ b/supported.conf
@@ -707,6 +707,7 @@
drivers/infiniband/hw/qib/ib_qib
drivers/infiniband/hw/usnic/usnic_verbs.ko
drivers/infiniband/sw/rdmavt/rdmavt
+ drivers/infiniband/sw/rxe/rdma_rxe.ko
drivers/infiniband/ulp/ipoib/ib_ipoib
drivers/infiniband/ulp/iser/ib_iser
drivers/infiniband/ulp/isert/ib_isert.ko