diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:18:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 08:18:25 -0400 |
| commit | 3e87ea6dd13128d6ac00c574525d16a402345174 (patch) | |
| tree | 5b9b5b962fe5f63c061274d1990559441fc36cc1 | |
| parent | 268d2b3e25b86514634a8c6cd97ee95f43213963 (diff) | |
| download | longterm-queue-4.12-3e87ea6dd13128d6ac00c574525d16a402345174.tar.gz | |
rdma: drop IB patch n/a for 4.12.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/RDMA-hns-Avoid-NULL-pointer-exception.patch | 41 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/queue/RDMA-hns-Avoid-NULL-pointer-exception.patch b/queue/RDMA-hns-Avoid-NULL-pointer-exception.patch deleted file mode 100644 index ec9f81c..0000000 --- a/queue/RDMA-hns-Avoid-NULL-pointer-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5e437b1d7e8d31ff9a4b8e898eb3a6cee309edd9 Mon Sep 17 00:00:00 2001 -From: "Wei Hu(Xavier)" <xavier.huwei@huawei.com> -Date: Fri, 29 Sep 2017 23:10:12 +0800 -Subject: [PATCH] RDMA/hns: Avoid NULL pointer exception - -commit 5e437b1d7e8d31ff9a4b8e898eb3a6cee309edd9 upstream. - -After the loop in hns_roce_v1_mr_free_work_fn function, it is possible that -all qps will have been freed (in which case ne will be 0). If that -happens, then later in the function when we dereference hr_qp we will -get an exception. Check ne is not 0 to make sure we actually have an -hr_qp left to work on. - -This patch fixes the smatch error as below: -drivers/infiniband/hw/hns/hns_roce_hw_v1.c:1009 hns_roce_v1_mr_free_work_fn() -error: we previously assumed 'hr_qp' could be null - -Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com> -Signed-off-by: Lijun Ou <oulijun@huawei.com> -Signed-off-by: Shaobo Xu <xushaobo2@huawei.com> -Signed-off-by: Doug Ledford <dledford@redhat.com> - -diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c -index 98887dd8ccb3..852db18ec128 100644 ---- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c -+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c -@@ -1004,6 +1004,11 @@ static void hns_roce_v1_mr_free_work_fn(struct work_struct *work) - } - } - -+ if (!ne) { -+ dev_err(dev, "Reseved loop qp is absent!\n"); -+ goto free_work; -+ } -+ - do { - ret = hns_roce_v1_poll_cq(&mr_free_cq->ib_cq, ne, wc); - if (ret < 0) { --- -2.15.0 - diff --git a/queue/series b/queue/series index 779b4ad..3c8a610 100644 --- a/queue/series +++ b/queue/series @@ -34,7 +34,6 @@ vfio-pci-Virtualize-Maximum-Payload-Size.patch fm10k-ensure-we-process-SM-mbx-when-processing-VF-mb.patch ibmvnic-Set-state-UP.patch net-ipv6-send-NS-for-DAD-when-link-operationally-up.patch -RDMA-hns-Avoid-NULL-pointer-exception.patch staging-greybus-light-Release-memory-obtained-by-kas.patch clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch |