1*4882a593SmuzhiyunFrom ceebf5998b71e11c81133680560b498977d3d3cd Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Chrostoper Ertl <chertl@microsoft.com>
3*4882a593SmuzhiyunDate: Thu, 28 Nov 2019 17:06:39 +0000
4*4882a593SmuzhiyunSubject: [PATCH] lanp: Fix buffer overflows in get_lan_param_select
5*4882a593SmuzhiyunMIME-Version: 1.0
6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8
7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunPartial fix for CVE-2020-5208, see
10*4882a593Smuzhiyunhttps://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunThe `get_lan_param_select` function is missing a validation check on the
13*4882a593Smuzhiyunresponse’s `data_len`, which it then returns to caller functions, where
14*4882a593Smuzhiyunstack buffer overflow can occur.
15*4882a593Smuzhiyun
16*4882a593Smuzhiyun[Retrieve from:
17*4882a593Smuzhiyunhttps://github.com/ipmitool/ipmitool/commit/d45572d71e70840e0d4c50bf48218492b79c1a10]
18*4882a593SmuzhiyunSigned-off-by: Heiko Thiery <heiko.thiery@gmail.com>
19*4882a593Smuzhiyun---
20*4882a593Smuzhiyun lib/ipmi_lanp.c | 14 +++++++-------
21*4882a593Smuzhiyun 1 file changed, 7 insertions(+), 7 deletions(-)
22*4882a593Smuzhiyun
23*4882a593Smuzhiyundiff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
24*4882a593Smuzhiyunindex 65d881b..022c7f1 100644
25*4882a593Smuzhiyun--- a/lib/ipmi_lanp.c
26*4882a593Smuzhiyun+++ b/lib/ipmi_lanp.c
27*4882a593Smuzhiyun@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
28*4882a593Smuzhiyun 		if (p == NULL) {
29*4882a593Smuzhiyun 			return (-1);
30*4882a593Smuzhiyun 		}
31*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
32*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
33*4882a593Smuzhiyun 		/* set new ipaddr */
34*4882a593Smuzhiyun 		memcpy(data+3, temp, 4);
35*4882a593Smuzhiyun 		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
36*4882a593Smuzhiyun@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
37*4882a593Smuzhiyun 		if (p == NULL) {
38*4882a593Smuzhiyun 			return (-1);
39*4882a593Smuzhiyun 		}
40*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
41*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
42*4882a593Smuzhiyun 		/* set new macaddr */
43*4882a593Smuzhiyun 		memcpy(data+7, temp, 6);
44*4882a593Smuzhiyun 		printf("Setting LAN Alert %d MAC Address to "
45*4882a593Smuzhiyun@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
46*4882a593Smuzhiyun 		if (p == NULL) {
47*4882a593Smuzhiyun 			return (-1);
48*4882a593Smuzhiyun 		}
49*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
50*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
51*4882a593Smuzhiyun
52*4882a593Smuzhiyun 		if (strncasecmp(argv[1], "def", 3) == 0 ||
53*4882a593Smuzhiyun 		    strncasecmp(argv[1], "default", 7) == 0) {
54*4882a593Smuzhiyun@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
55*4882a593Smuzhiyun 		if (p == NULL) {
56*4882a593Smuzhiyun 			return (-1);
57*4882a593Smuzhiyun 		}
58*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
59*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
60*4882a593Smuzhiyun
61*4882a593Smuzhiyun 		if (strncasecmp(argv[1], "on", 2) == 0 ||
62*4882a593Smuzhiyun 		    strncasecmp(argv[1], "yes", 3) == 0) {
63*4882a593Smuzhiyun@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
64*4882a593Smuzhiyun 		if (p == NULL) {
65*4882a593Smuzhiyun 			return (-1);
66*4882a593Smuzhiyun 		}
67*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
68*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
69*4882a593Smuzhiyun
70*4882a593Smuzhiyun 		if (strncasecmp(argv[1], "pet", 3) == 0) {
71*4882a593Smuzhiyun 			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
72*4882a593Smuzhiyun@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
73*4882a593Smuzhiyun 		if (p == NULL) {
74*4882a593Smuzhiyun 			return (-1);
75*4882a593Smuzhiyun 		}
76*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
77*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
78*4882a593Smuzhiyun
79*4882a593Smuzhiyun 		if (str2uchar(argv[1], &data[2]) != 0) {
80*4882a593Smuzhiyun 			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
81*4882a593Smuzhiyun@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
82*4882a593Smuzhiyun 		if (p == NULL) {
83*4882a593Smuzhiyun 			return (-1);
84*4882a593Smuzhiyun 		}
85*4882a593Smuzhiyun-		memcpy(data, p->data, p->data_len);
86*4882a593Smuzhiyun+		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
87*4882a593Smuzhiyun
88*4882a593Smuzhiyun 		if (str2uchar(argv[1], &data[3]) != 0) {
89*4882a593Smuzhiyun 			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
90*4882a593Smuzhiyun--
91*4882a593Smuzhiyun2.20.1
92*4882a593Smuzhiyun
93