diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-02-09 07:12:42 +0100 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2016-02-10 01:14:17 +0100 |
commit | 8f34b8efbd344ab53d0757e5a08cbf9778191d9b (patch) | |
tree | 5e961e7863b9e7957506e1b3bb74fd953b247fc3 | |
parent | 4e4e1a7e09245239a18e484c946cf94f5563a391 (diff) | |
download | meta-enea-8f34b8efbd344ab53d0757e5a08cbf9778191d9b.tar.gz |
kernel-rds: CVE-2015-2042
Fixes information handling flaw in rds sysctl files.
Reference:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-2042
Upstream fix:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/
patch/?id=b4482b533bfb54232f31d72c8ab70c1400385040
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
-rw-r--r-- | recipes-kernel/linux/linux-qoriq-3.12/net-rds-CVE-2015-2042.patch | 48 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq-common.inc | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-qoriq-3.12/net-rds-CVE-2015-2042.patch b/recipes-kernel/linux/linux-qoriq-3.12/net-rds-CVE-2015-2042.patch new file mode 100644 index 0000000..a9ee664 --- /dev/null +++ b/recipes-kernel/linux/linux-qoriq-3.12/net-rds-CVE-2015-2042.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From b4482b533bfb54232f31d72c8ab70c1400385040 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sasha Levin <sasha.levin@oracle.com> | ||
3 | Date: Tue, 3 Feb 2015 08:55:58 -0500 | ||
4 | Subject: net: rds: use correct size for max unacked packets and bytes | ||
5 | |||
6 | commit db27ebb111e9f69efece08e4cb6a34ff980f8896 upstream. | ||
7 | |||
8 | Max unacked packets/bytes is an int while sizeof(long) was used in the | ||
9 | sysctl table. | ||
10 | |||
11 | This means that when they were getting read we'd also leak kernel memory | ||
12 | to userspace along with the timeout values. | ||
13 | |||
14 | Fixes CVE-2015-2041. | ||
15 | Upstream-Status: Backport | ||
16 | |||
17 | Signed-off-by: Sasha Levin <sasha.levin@oracle.com> | ||
18 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
19 | Signed-off-by: Jiri Slaby <jslaby@suse.cz> | ||
20 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
21 | --- | ||
22 | net/rds/sysctl.c | 4 ++-- | ||
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c | ||
26 | index b5cb2aa..35773ad 100644 | ||
27 | --- a/net/rds/sysctl.c | ||
28 | +++ b/net/rds/sysctl.c | ||
29 | @@ -71,14 +71,14 @@ static struct ctl_table rds_sysctl_rds_table[] = { | ||
30 | { | ||
31 | .procname = "max_unacked_packets", | ||
32 | .data = &rds_sysctl_max_unacked_packets, | ||
33 | - .maxlen = sizeof(unsigned long), | ||
34 | + .maxlen = sizeof(int), | ||
35 | .mode = 0644, | ||
36 | .proc_handler = proc_dointvec, | ||
37 | }, | ||
38 | { | ||
39 | .procname = "max_unacked_bytes", | ||
40 | .data = &rds_sysctl_max_unacked_bytes, | ||
41 | - .maxlen = sizeof(unsigned long), | ||
42 | + .maxlen = sizeof(int), | ||
43 | .mode = 0644, | ||
44 | .proc_handler = proc_dointvec, | ||
45 | }, | ||
46 | -- | ||
47 | cgit v0.12 | ||
48 | |||
diff --git a/recipes-kernel/linux/linux-qoriq-common.inc b/recipes-kernel/linux/linux-qoriq-common.inc index 90cae6d..8e8e1c4 100644 --- a/recipes-kernel/linux/linux-qoriq-common.inc +++ b/recipes-kernel/linux/linux-qoriq-common.inc | |||
@@ -20,6 +20,7 @@ SRC_URI += "file://b4860-hard_irq_disable-bug.patch \ | |||
20 | file://dcache-CVE-2015-2925.patch \ | 20 | file://dcache-CVE-2015-2925.patch \ |
21 | file://virtio-net-CVE-2015-5156.patch \ | 21 | file://virtio-net-CVE-2015-5156.patch \ |
22 | file://ipc-CVE-2015-7613.patch \ | 22 | file://ipc-CVE-2015-7613.patch \ |
23 | file://net-rds-CVE-2015-2042.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | SRC_URI += "file://cfg/00013-localversion.cfg \ | 26 | SRC_URI += "file://cfg/00013-localversion.cfg \ |