import ipmitool-1.8.18-12.el8_1
This commit is contained in:
CentOS Sources
parent
0256723b3f
commit
8fcf306405
365
SOURCES/0008-CVE-2020-5208.patch
Normal file
365
SOURCES/0008-CVE-2020-5208.patch
Normal file
@ -0,0 +1,365 @@
|
|||||||
|
From 0e8ff944e776ba50cafeb4270ab439f689beed94 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chrostoper Ertl <chertl@microsoft.com>
|
||||||
|
Date: Thu, 28 Nov 2019 16:33:59 +0000
|
||||||
|
Subject: [PATCH] Fixes for CVE-2020-5208
|
||||||
|
|
||||||
|
see https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
|
||||||
|
|
||||||
|
This patch is combination of following commits:
|
||||||
|
|
||||||
|
pick e824c23316ae50beb7f7488f2055ac65e8b341f2 fru: Fix buffer overflow vulnerabilities
|
||||||
|
pick 840fb1cbb4fb365cb9797300e3374d4faefcdb10 fru: Fix buffer overflow in ipmi_spd_print_fru
|
||||||
|
pick 41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22 session: Fix buffer overflow in ipmi_get_session_info
|
||||||
|
pick d45572d71e70840e0d4c50bf48218492b79c1a10 lanp: Fix buffer overflows in get_lan_param_select
|
||||||
|
pick 7ccea283dd62a05a320c1921e3d8d71a87772637 fru, sdr: Fix id_string buffer overflows
|
||||||
|
|
||||||
|
[vdolezal@redhat.com]: fixed memleak of `spd_data` in
|
||||||
|
lib/dimm_spd.c:ipmi_spd_print_fru()
|
||||||
|
---
|
||||||
|
lib/dimm_spd.c | 11 ++++++++++-
|
||||||
|
lib/ipmi_fru.c | 35 ++++++++++++++++++++++++++++++++---
|
||||||
|
lib/ipmi_lanp.c | 14 +++++++-------
|
||||||
|
lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++----------------
|
||||||
|
lib/ipmi_session.c | 12 ++++++++----
|
||||||
|
5 files changed, 81 insertions(+), 31 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
|
||||||
|
index 41e30db..ebcc94c 100644
|
||||||
|
--- a/lib/dimm_spd.c
|
||||||
|
+++ b/lib/dimm_spd.c
|
||||||
|
@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
|
||||||
|
struct ipmi_rq req;
|
||||||
|
struct fru_info fru;
|
||||||
|
uint8_t *spd_data, msg_data[4];
|
||||||
|
- int len, offset;
|
||||||
|
+ uint32_t len, offset;
|
||||||
|
|
||||||
|
msg_data[0] = id;
|
||||||
|
|
||||||
|
@@ -1697,6 +1697,15 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
|
||||||
|
}
|
||||||
|
|
||||||
|
len = rsp->data[0];
|
||||||
|
+ if(rsp->data_len < 1
|
||||||
|
+ || len > rsp->data_len - 1
|
||||||
|
+ || len > fru.size - offset)
|
||||||
|
+ {
|
||||||
|
+ printf(" Not enough buffer size");
|
||||||
|
+ free(spd_data);
|
||||||
|
+ spd_data = NULL;
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
memcpy(&spd_data[offset], rsp->data + 1, len);
|
||||||
|
offset += len;
|
||||||
|
} while (offset < fru.size);
|
||||||
|
diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
|
||||||
|
index cf00eff..98bc984 100644
|
||||||
|
--- a/lib/ipmi_fru.c
|
||||||
|
+++ b/lib/ipmi_fru.c
|
||||||
|
@@ -615,7 +615,10 @@ int
|
||||||
|
read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
uint32_t offset, uint32_t length, uint8_t *frubuf)
|
||||||
|
{
|
||||||
|
- uint32_t off = offset, tmp, finish;
|
||||||
|
+ uint32_t off = offset;
|
||||||
|
+ uint32_t tmp;
|
||||||
|
+ uint32_t finish;
|
||||||
|
+ uint32_t size_left_in_buffer;
|
||||||
|
struct ipmi_rs * rsp;
|
||||||
|
struct ipmi_rq req;
|
||||||
|
uint8_t msg_data[4];
|
||||||
|
@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
|
||||||
|
finish = offset + length;
|
||||||
|
if (finish > fru->size) {
|
||||||
|
+ memset(frubuf + fru->size, 0, length - fru->size);
|
||||||
|
finish = fru->size;
|
||||||
|
lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
|
||||||
|
"Adjusting to %d",
|
||||||
|
offset + length, finish - offset);
|
||||||
|
+ length = finish - offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&req, 0, sizeof(req));
|
||||||
|
@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ size_left_in_buffer = length;
|
||||||
|
do {
|
||||||
|
tmp = fru->access ? off >> 1 : off;
|
||||||
|
msg_data[0] = id;
|
||||||
|
@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
}
|
||||||
|
|
||||||
|
tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
|
||||||
|
+ if(rsp->data_len < 1
|
||||||
|
+ || tmp > rsp->data_len - 1
|
||||||
|
+ || tmp > size_left_in_buffer)
|
||||||
|
+ {
|
||||||
|
+ printf(" Not enough buffer size");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
memcpy(frubuf, rsp->data + 1, tmp);
|
||||||
|
off += tmp;
|
||||||
|
frubuf += tmp;
|
||||||
|
+ size_left_in_buffer -= tmp;
|
||||||
|
/* sometimes the size returned in the Info command
|
||||||
|
* is too large. return 0 so higher level function
|
||||||
|
* still attempts to parse what was returned */
|
||||||
|
@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
uint32_t offset, uint32_t length, uint8_t *frubuf)
|
||||||
|
{
|
||||||
|
static uint32_t fru_data_rqst_size = 20;
|
||||||
|
- uint32_t off = offset, tmp, finish;
|
||||||
|
+ uint32_t off = offset;
|
||||||
|
+ uint32_t tmp, finish;
|
||||||
|
+ uint32_t size_left_in_buffer;
|
||||||
|
struct ipmi_rs * rsp;
|
||||||
|
struct ipmi_rq req;
|
||||||
|
uint8_t msg_data[4];
|
||||||
|
@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
|
||||||
|
finish = offset + length;
|
||||||
|
if (finish > fru->size) {
|
||||||
|
+ memset(frubuf + fru->size, 0, length - fru->size);
|
||||||
|
finish = fru->size;
|
||||||
|
lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
|
||||||
|
"Adjusting to %d",
|
||||||
|
offset + length, finish - offset);
|
||||||
|
+ length = finish - offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&req, 0, sizeof(req));
|
||||||
|
@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
if (fru->access && fru_data_rqst_size > 16)
|
||||||
|
#endif
|
||||||
|
fru_data_rqst_size = 16;
|
||||||
|
+
|
||||||
|
+ size_left_in_buffer = length;
|
||||||
|
do {
|
||||||
|
tmp = fru->access ? off >> 1 : off;
|
||||||
|
msg_data[0] = id;
|
||||||
|
@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
|
||||||
|
}
|
||||||
|
|
||||||
|
tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
|
||||||
|
+ if(rsp->data_len < 1
|
||||||
|
+ || tmp > rsp->data_len - 1
|
||||||
|
+ || tmp > size_left_in_buffer)
|
||||||
|
+ {
|
||||||
|
+ printf(" Not enough buffer size");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
memcpy((frubuf + off)-offset, rsp->data + 1, tmp);
|
||||||
|
off += tmp;
|
||||||
|
+ size_left_in_buffer -= tmp;
|
||||||
|
|
||||||
|
/* sometimes the size returned in the Info command
|
||||||
|
* is too large. return 0 so higher level function
|
||||||
|
@@ -3033,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
memset(desc, 0, sizeof(desc));
|
||||||
|
- memcpy(desc, fru->id_string, fru->id_code & 0x01f);
|
||||||
|
+ memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc)));
|
||||||
|
desc[fru->id_code & 0x01f] = 0;
|
||||||
|
printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
|
||||||
|
|
||||||
|
diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
|
||||||
|
index 65d881b..022c7f1 100644
|
||||||
|
--- a/lib/ipmi_lanp.c
|
||||||
|
+++ b/lib/ipmi_lanp.c
|
||||||
|
@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
/* set new ipaddr */
|
||||||
|
memcpy(data+3, temp, 4);
|
||||||
|
printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
|
||||||
|
@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
/* set new macaddr */
|
||||||
|
memcpy(data+7, temp, 6);
|
||||||
|
printf("Setting LAN Alert %d MAC Address to "
|
||||||
|
@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
|
||||||
|
if (strncasecmp(argv[1], "def", 3) == 0 ||
|
||||||
|
strncasecmp(argv[1], "default", 7) == 0) {
|
||||||
|
@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
|
||||||
|
if (strncasecmp(argv[1], "on", 2) == 0 ||
|
||||||
|
strncasecmp(argv[1], "yes", 3) == 0) {
|
||||||
|
@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
|
||||||
|
if (strncasecmp(argv[1], "pet", 3) == 0) {
|
||||||
|
printf("Setting LAN Alert %d destination to PET Trap\n", alert);
|
||||||
|
@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
|
||||||
|
if (str2uchar(argv[1], &data[2]) != 0) {
|
||||||
|
lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
|
||||||
|
@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
|
||||||
|
if (p == NULL) {
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
- memcpy(data, p->data, p->data_len);
|
||||||
|
+ memcpy(data, p->data, __min(p->data_len, sizeof(data)));
|
||||||
|
|
||||||
|
if (str2uchar(argv[1], &data[3]) != 0) {
|
||||||
|
lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
|
||||||
|
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
|
||||||
|
index fd2c02d..01d81f7 100644
|
||||||
|
--- a/lib/ipmi_sdr.c
|
||||||
|
+++ b/lib/ipmi_sdr.c
|
||||||
|
@@ -2086,7 +2086,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
memset(desc, 0, sizeof (desc));
|
||||||
|
- snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string);
|
||||||
|
+ snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string);
|
||||||
|
|
||||||
|
if (verbose) {
|
||||||
|
printf("Sensor ID : %s (0x%x)\n",
|
||||||
|
@@ -2137,7 +2137,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
memset(desc, 0, sizeof (desc));
|
||||||
|
- snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string);
|
||||||
|
+ snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string);
|
||||||
|
|
||||||
|
if (verbose == 0) {
|
||||||
|
if (csv_output)
|
||||||
|
@@ -2230,7 +2230,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
|
||||||
|
char desc[17];
|
||||||
|
|
||||||
|
memset(desc, 0, sizeof (desc));
|
||||||
|
- snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string);
|
||||||
|
+ snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string);
|
||||||
|
|
||||||
|
if (!verbose) {
|
||||||
|
if (csv_output)
|
||||||
|
@@ -2287,7 +2287,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
|
||||||
|
char desc[17];
|
||||||
|
|
||||||
|
memset(desc, 0, sizeof (desc));
|
||||||
|
- snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string);
|
||||||
|
+ snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string);
|
||||||
|
|
||||||
|
if (!verbose) {
|
||||||
|
if (csv_output)
|
||||||
|
@@ -2491,35 +2491,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
|
||||||
|
|
||||||
|
int rc =0;
|
||||||
|
char desc[17];
|
||||||
|
+ const char *id_string;
|
||||||
|
+ uint8_t id_code;
|
||||||
|
memset(desc, ' ', sizeof (desc));
|
||||||
|
|
||||||
|
switch ( type) {
|
||||||
|
case SDR_RECORD_TYPE_FULL_SENSOR:
|
||||||
|
record.full = (struct sdr_record_full_sensor *) raw;
|
||||||
|
- snprintf(desc, (record.full->id_code & 0x1f) +1, "%s",
|
||||||
|
- (const char *)record.full->id_string);
|
||||||
|
+ id_code = record.full->id_code;
|
||||||
|
+ id_string = record.full->id_string;
|
||||||
|
break;
|
||||||
|
+
|
||||||
|
case SDR_RECORD_TYPE_COMPACT_SENSOR:
|
||||||
|
record.compact = (struct sdr_record_compact_sensor *) raw ;
|
||||||
|
- snprintf(desc, (record.compact->id_code & 0x1f) +1, "%s",
|
||||||
|
- (const char *)record.compact->id_string);
|
||||||
|
+ id_code = record.compact->id_code;
|
||||||
|
+ id_string = record.compact->id_string;
|
||||||
|
break;
|
||||||
|
+
|
||||||
|
case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
|
||||||
|
record.eventonly = (struct sdr_record_eventonly_sensor *) raw ;
|
||||||
|
- snprintf(desc, (record.eventonly->id_code & 0x1f) +1, "%s",
|
||||||
|
- (const char *)record.eventonly->id_string);
|
||||||
|
- break;
|
||||||
|
+ id_code = record.eventonly->id_code;
|
||||||
|
+ id_string = record.eventonly->id_string;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
|
||||||
|
record.mcloc = (struct sdr_record_mc_locator *) raw ;
|
||||||
|
- snprintf(desc, (record.mcloc->id_code & 0x1f) +1, "%s",
|
||||||
|
- (const char *)record.mcloc->id_string);
|
||||||
|
+ id_code = record.mcloc->id_code;
|
||||||
|
+ id_string = record.mcloc->id_string;
|
||||||
|
break;
|
||||||
|
+
|
||||||
|
default:
|
||||||
|
rc = -1;
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
+ }
|
||||||
|
+ if (!rc) {
|
||||||
|
+ snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
|
||||||
|
+ lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
|
||||||
|
index 141f0f4..b9af1fd 100644
|
||||||
|
--- a/lib/ipmi_session.c
|
||||||
|
+++ b/lib/ipmi_session.c
|
||||||
|
@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf * intf,
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- memcpy(&session_info, rsp->data, rsp->data_len);
|
||||||
|
- print_session_info(&session_info, rsp->data_len);
|
||||||
|
+ memcpy(&session_info, rsp->data,
|
||||||
|
+ __min(rsp->data_len, sizeof(session_info)));
|
||||||
|
+ print_session_info(&session_info,
|
||||||
|
+ __min(rsp->data_len, sizeof(session_info)));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf * intf,
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- memcpy(&session_info, rsp->data, rsp->data_len);
|
||||||
|
- print_session_info(&session_info, rsp->data_len);
|
||||||
|
+ memcpy(&session_info, rsp->data,
|
||||||
|
+ __min(rsp->data_len, sizeof(session_info)));
|
||||||
|
+ print_session_info(&session_info,
|
||||||
|
+ __min(rsp->data_len, sizeof(session_info)));
|
||||||
|
|
||||||
|
} while (i <= session_info.session_slot_count);
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
44
SOURCES/0009-CVE-2020-5208_2.patch
Normal file
44
SOURCES/0009-CVE-2020-5208_2.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
From f87d8c7721dd6ca2e1e94342fa5688e58fb0af15 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vaclav Dolezal <vdolezal@redhat.com>
|
||||||
|
Date: Wed, 12 Feb 2020 15:20:32 +0100
|
||||||
|
Subject: [PATCH] Partial fix for CVE-2020-5208
|
||||||
|
|
||||||
|
replacement for patch:
|
||||||
|
9452be8 channel: Fix buffer overflow
|
||||||
|
|
||||||
|
Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
|
||||||
|
---
|
||||||
|
lib/ipmi_channel.c | 10 ++++++++++
|
||||||
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
|
||||||
|
index e1fc75f..81ae82e 100644
|
||||||
|
--- a/lib/ipmi_channel.c
|
||||||
|
+++ b/lib/ipmi_channel.c
|
||||||
|
@@ -383,6 +383,11 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
|
||||||
|
val2str(rsp->ccode, completion_code_vals));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
+ if (rsp->data_len > 17) {
|
||||||
|
+ lprintf(LOG_ERR, "Get Channel Cipher Suites failed - "
|
||||||
|
+ "received invalid data");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -418,6 +423,11 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
|
||||||
|
val2str(rsp->ccode, completion_code_vals));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
+ if (rsp->data_len > 17) {
|
||||||
|
+ lprintf(LOG_ERR, "Get Channel Cipher Suites failed - "
|
||||||
|
+ "received invalid data");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Copy last chunk */
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: ipmitool
|
Name: ipmitool
|
||||||
Summary: Utility for IPMI control
|
Summary: Utility for IPMI control
|
||||||
Version: 1.8.18
|
Version: 1.8.18
|
||||||
Release: 10%{?dist}
|
Release: 12%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://ipmitool.sourceforge.net/
|
URL: http://ipmitool.sourceforge.net/
|
||||||
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||||
@ -20,6 +20,8 @@ Patch4: 0004-slowswid.patch
|
|||||||
Patch5: 0005-sensor-id-length.patch
|
Patch5: 0005-sensor-id-length.patch
|
||||||
Patch6: 0006-enable-usb.patch
|
Patch6: 0006-enable-usb.patch
|
||||||
Patch7: 0007-check-input.patch
|
Patch7: 0007-check-input.patch
|
||||||
|
Patch8: 0008-CVE-2020-5208.patch
|
||||||
|
Patch9: 0009-CVE-2020-5208_2.patch
|
||||||
|
|
||||||
BuildRequires: openssl-devel readline-devel ncurses-devel
|
BuildRequires: openssl-devel readline-devel ncurses-devel
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
@ -106,7 +108,9 @@ autoconf
|
|||||||
automake --foreign
|
automake --foreign
|
||||||
# end: release auto-tools
|
# end: release auto-tools
|
||||||
|
|
||||||
%configure --disable-dependency-tracking --enable-file-security --disable-intf-free
|
%configure \
|
||||||
|
CFLAGS="%{optflags} -fno-strict-aliasing" \
|
||||||
|
--disable-dependency-tracking --enable-file-security --disable-intf-free
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -177,6 +181,12 @@ install -Dm 755 contrib/bmc-snmp-proxy %{buildroot}%{_libexecdir}/bmc-sn
|
|||||||
%{_libexecdir}/bmc-snmp-proxy
|
%{_libexecdir}/bmc-snmp-proxy
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 04 2020 Václav Doležal <vdolezal@redhat.com> - 1.8.18-12
|
||||||
|
- Disable -fstrict-aliasing (RPMDiff issue)
|
||||||
|
|
||||||
|
* Tue Mar 03 2020 Václav Doležal <vdolezal@redhat.com> - 1.8.18-11
|
||||||
|
- Backport fix for CVE-2020-5208
|
||||||
|
|
||||||
* Thu Feb 22 2018 Josef Ridky <jridky@redhat.com> - 1.8.18-10
|
* Thu Feb 22 2018 Josef Ridky <jridky@redhat.com> - 1.8.18-10
|
||||||
- Spec clean up
|
- Spec clean up
|
||||||
- Add support to set kg key
|
- Add support to set kg key
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user