Linux v4.15.17
This commit is contained in:
Laura Abbott
parent
7867cdd943
commit
5666c27e64
|
|
@ -1,4 +1,4 @@
|
|||
From 0558f33c06bb910e2879e355192227a8e8f0219d Mon Sep 17 00:00:00 2001
|
||||
From f66d69bd8357b59268f2adfd1c0c53b6d1dab453 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Yan <yanaijie@huawei.com>
|
||||
Date: Fri, 8 Dec 2017 17:42:09 +0800
|
||||
Subject: [PATCH] scsi: libsas: direct call probe and destruct
|
||||
|
|
@ -83,19 +83,19 @@ index 70be4425ae0b..2b3637b40dde 100644
|
|||
@@ -730,7 +730,6 @@ int sas_discover_sata(struct domain_device *dev)
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
|
||||
- sas_discover_event(dev->port, DISCE_PROBE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
|
||||
index 14f714d05767..e4fd078e4175 100644
|
||||
index 60de66252fa2..487d7345f515 100644
|
||||
--- a/drivers/scsi/libsas/sas_discover.c
|
||||
+++ b/drivers/scsi/libsas/sas_discover.c
|
||||
@@ -212,13 +212,9 @@ void sas_notify_lldd_dev_gone(struct domain_device *dev)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-static void sas_probe_devices(struct work_struct *work)
|
||||
+static void sas_probe_devices(struct asd_sas_port *port)
|
||||
{
|
||||
|
|
@ -104,7 +104,7 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
- struct asd_sas_port *port = ev->port;
|
||||
-
|
||||
- clear_bit(DISCE_PROBE, &port->disc.pending);
|
||||
|
||||
|
||||
/* devices must be domain members before link recovery and probe */
|
||||
list_for_each_entry(dev, &port->disco_list, disco_list_node) {
|
||||
@@ -294,7 +290,6 @@ int sas_discover_end_dev(struct domain_device *dev)
|
||||
|
|
@ -112,13 +112,13 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
if (res)
|
||||
return res;
|
||||
- sas_discover_event(dev->port, DISCE_PROBE);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -353,13 +348,9 @@ static void sas_unregister_common_dev(struct asd_sas_port *port, struct domain_d
|
||||
sas_put_device(dev);
|
||||
}
|
||||
|
||||
|
||||
-static void sas_destruct_devices(struct work_struct *work)
|
||||
+void sas_destruct_devices(struct asd_sas_port *port)
|
||||
{
|
||||
|
|
@ -127,13 +127,13 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
- struct asd_sas_port *port = ev->port;
|
||||
-
|
||||
- clear_bit(DISCE_DESTRUCT, &port->disc.pending);
|
||||
|
||||
|
||||
list_for_each_entry_safe(dev, n, &port->destroy_list, disco_list_node) {
|
||||
list_del_init(&dev->disco_list_node);
|
||||
@@ -370,6 +361,16 @@ static void sas_destruct_devices(struct work_struct *work)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+static void sas_destruct_ports(struct asd_sas_port *port)
|
||||
+{
|
||||
+ struct sas_port *sas_port, *p;
|
||||
|
|
@ -154,11 +154,11 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
- sas_discover_event(dev->port, DISCE_DESTRUCT);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -490,6 +490,8 @@ static void sas_discover_domain(struct work_struct *work)
|
||||
port->port_dev = NULL;
|
||||
}
|
||||
|
||||
|
||||
+ sas_probe_devices(port);
|
||||
+
|
||||
SAS_DPRINTK("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id,
|
||||
|
|
@ -173,7 +173,7 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
+ sas_destruct_ports(port);
|
||||
+ sas_probe_devices(port);
|
||||
}
|
||||
|
||||
|
||||
/* ---------- Events ---------- */
|
||||
@@ -578,10 +584,8 @@ void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port)
|
||||
static const work_func_t sas_event_fns[DISC_NUM_EVENTS] = {
|
||||
|
|
@ -184,10 +184,10 @@ index 14f714d05767..e4fd078e4175 100644
|
|||
[DISCE_RESUME] = sas_resume_devices,
|
||||
- [DISCE_DESTRUCT] = sas_destruct_devices,
|
||||
};
|
||||
|
||||
|
||||
disc->pending = 0;
|
||||
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
|
||||
index a8a57b0593e3..7444d40e261c 100644
|
||||
index 39e42744aa33..6a4f8198b78e 100644
|
||||
--- a/drivers/scsi/libsas/sas_expander.c
|
||||
+++ b/drivers/scsi/libsas/sas_expander.c
|
||||
@@ -1916,7 +1916,8 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
|
||||
|
|
@ -202,13 +202,13 @@ index a8a57b0593e3..7444d40e261c 100644
|
|||
}
|
||||
@@ -2124,7 +2125,7 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev)
|
||||
struct domain_device *dev = NULL;
|
||||
|
||||
|
||||
res = sas_find_bcast_dev(port_dev, &dev);
|
||||
- while (res == 0 && dev) {
|
||||
+ if (res == 0 && dev) {
|
||||
struct expander_device *ex = &dev->ex_dev;
|
||||
int i = 0, phy_id;
|
||||
|
||||
|
||||
@@ -2136,9 +2137,6 @@ int sas_ex_revalidate_domain(struct domain_device *port_dev)
|
||||
res = sas_rediscover(dev, phy_id);
|
||||
i = phy_id + 1;
|
||||
|
|
@ -225,14 +225,14 @@ index d8826a747690..50e12d662ffe 100644
|
|||
+++ b/drivers/scsi/libsas/sas_internal.h
|
||||
@@ -101,6 +101,7 @@ int sas_try_ata_reset(struct asd_sas_phy *phy);
|
||||
void sas_hae_reset(struct work_struct *work);
|
||||
|
||||
|
||||
void sas_free_device(struct kref *kref);
|
||||
+void sas_destruct_devices(struct asd_sas_port *port);
|
||||
|
||||
#ifdef CONFIG_SCSI_SAS_HOST_SMP
|
||||
extern void sas_smp_host_handler(struct bsg_job *job, struct Scsi_Host *shost);
|
||||
|
||||
extern const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS];
|
||||
extern const work_func_t sas_port_event_fns[PORT_NUM_EVENTS];
|
||||
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
|
||||
index 64722f42b256..f07e55d3aa73 100644
|
||||
index 93266283f51f..170f5043e1df 100644
|
||||
--- a/drivers/scsi/libsas/sas_port.c
|
||||
+++ b/drivers/scsi/libsas/sas_port.c
|
||||
@@ -66,6 +66,7 @@ static void sas_resume_port(struct asd_sas_phy *phy)
|
||||
|
|
@ -242,16 +242,16 @@ index 64722f42b256..f07e55d3aa73 100644
|
|||
+ sas_destruct_devices(port);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -220,6 +221,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
|
||||
|
||||
|
||||
@@ -219,6 +220,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
|
||||
|
||||
if (port->num_phys == 1) {
|
||||
sas_unregister_domain_devices(port, gone);
|
||||
+ sas_destruct_devices(port);
|
||||
sas_port_delete(port->port);
|
||||
port->port = NULL;
|
||||
} else {
|
||||
@@ -317,6 +319,7 @@ static void sas_init_port(struct asd_sas_port *port,
|
||||
@@ -313,6 +315,7 @@ static void sas_init_port(struct asd_sas_port *port,
|
||||
INIT_LIST_HEAD(&port->dev_list);
|
||||
INIT_LIST_HEAD(&port->disco_list);
|
||||
INIT_LIST_HEAD(&port->destroy_list);
|
||||
|
|
@ -260,10 +260,10 @@ index 64722f42b256..f07e55d3aa73 100644
|
|||
INIT_LIST_HEAD(&port->phy_list);
|
||||
port->ha = sas_ha;
|
||||
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
|
||||
index 6255bb5ed1e4..1cab6f7af425 100644
|
||||
index 61c84d536a7e..38fa2f677cf2 100644
|
||||
--- a/include/scsi/libsas.h
|
||||
+++ b/include/scsi/libsas.h
|
||||
@@ -82,10 +82,8 @@ enum phy_event {
|
||||
@@ -81,10 +81,8 @@ enum phy_event {
|
||||
enum discover_event {
|
||||
DISCE_DISCOVER_DOMAIN = 0U,
|
||||
DISCE_REVALIDATE_DOMAIN,
|
||||
|
|
@ -273,26 +273,26 @@ index 6255bb5ed1e4..1cab6f7af425 100644
|
|||
- DISCE_DESTRUCT,
|
||||
DISC_NUM_EVENTS,
|
||||
};
|
||||
|
||||
@@ -262,6 +260,7 @@ struct asd_sas_port {
|
||||
|
||||
@@ -261,6 +259,7 @@ struct asd_sas_port {
|
||||
struct list_head dev_list;
|
||||
struct list_head disco_list;
|
||||
struct list_head destroy_list;
|
||||
+ struct list_head sas_port_del_list;
|
||||
enum sas_linkrate linkrate;
|
||||
|
||||
|
||||
struct sas_work work;
|
||||
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
|
||||
index 62895b405933..05ec927a3c72 100644
|
||||
--- a/include/scsi/scsi_transport_sas.h
|
||||
+++ b/include/scsi/scsi_transport_sas.h
|
||||
@@ -156,6 +156,7 @@ struct sas_port {
|
||||
|
||||
|
||||
struct mutex phy_list_mutex;
|
||||
struct list_head phy_list;
|
||||
+ struct list_head del_list; /* libsas only */
|
||||
};
|
||||
|
||||
|
||||
#define dev_to_sas_port(d) \
|
||||
--
|
||||
2.14.3
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
From 4a491b1ab11ca0556d2fda1ff1301e862a2d44c4 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Yan <yanaijie@huawei.com>
|
||||
Date: Thu, 4 Jan 2018 21:04:31 +0800
|
||||
Subject: [PATCH] scsi: libsas: fix memory leak in sas_smp_get_phy_events()
|
||||
|
||||
We've got a memory leak with the following producer:
|
||||
|
||||
while true;
|
||||
do cat /sys/class/sas_phy/phy-1:0:12/invalid_dword_count >/dev/null;
|
||||
done
|
||||
|
||||
The buffer req is allocated and not freed after we return. Fix it.
|
||||
|
||||
Fixes: 2908d778ab3e ("[SCSI] aic94xx: new driver")
|
||||
Signed-off-by: Jason Yan <yanaijie@huawei.com>
|
||||
CC: John Garry <john.garry@huawei.com>
|
||||
CC: chenqilin <chenqilin2@huawei.com>
|
||||
CC: chenxiang <chenxiang66@hisilicon.com>
|
||||
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
||||
Reviewed-by: Hannes Reinecke <hare@suse.com>
|
||||
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
||||
---
|
||||
drivers/scsi/libsas/sas_expander.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
|
||||
index ca1566237ae7..1de59c0fdbc0 100644
|
||||
--- a/drivers/scsi/libsas/sas_expander.c
|
||||
+++ b/drivers/scsi/libsas/sas_expander.c
|
||||
@@ -695,6 +695,7 @@ int sas_smp_get_phy_events(struct sas_phy *phy)
|
||||
phy->phy_reset_problem_count = scsi_to_u32(&resp[24]);
|
||||
|
||||
out:
|
||||
+ kfree(req);
|
||||
kfree(resp);
|
||||
return res;
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 16
|
||||
%define stable_update 17
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -632,9 +632,6 @@ Patch653: CVE-2018-1000026.patch
|
|||
# rhbz 1549316
|
||||
Patch657: ipmi-fixes.patch
|
||||
|
||||
# CVE-2018-7757 rhbz 1553361 1553363
|
||||
Patch658: 0001-scsi-libsas-fix-memory-leak-in-sas_smp_get_phy_event.patch
|
||||
|
||||
# CVE-2018-8043 rhbz 1554199 1554200
|
||||
Patch660: 0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch
|
||||
|
||||
|
|
@ -1948,6 +1945,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Apr 12 2018 Laura Abbott <labbott@redhat.com> - 4.15.17-200
|
||||
- Linux v4.15.17
|
||||
|
||||
* Thu Apr 12 2018 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||
- Fix CVE-2018-10021 (rhbz 1566407 1566409)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
|
||||
SHA512 (patch-4.15.16.xz) = 62776fb409050c77c08394129c0978dbe8832e124ab435570cb083167226b3bf1771c68f18aa25cd69ad9038a22a1472adce02825b97f1c718bf161d8856afa3
|
||||
SHA512 (patch-4.15.17.xz) = fa1d0c0f9c55bb32ffc01b080ddf24fb69584e3c29d6d6b27ba24fd5bd7ad44d0fb0c18a269e33ef3f0fb4f10ed64e1f429cf621f61f49e5de33acba788e7ba8
|
||||
|
|
|
|||
Loading…
Reference in New Issue