Fix CVE-2017-12154 CVE-2017-12153 CVE-2017-1000251
This commit is contained in:
parent
3d3fae962b
commit
1cea4bfbc9
|
@ -0,0 +1,357 @@
|
||||||
|
From e860d2c904d1a9f38a24eb44c9f34b8f915a6ea3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ben Seri <ben@armis.com>
|
||||||
|
Date: Sat, 9 Sep 2017 23:15:59 +0200
|
||||||
|
Subject: Bluetooth: Properly check L2CAP config option output buffer length
|
||||||
|
|
||||||
|
From: Ben Seri <ben@armis.com>
|
||||||
|
|
||||||
|
commit e860d2c904d1a9f38a24eb44c9f34b8f915a6ea3 upstream.
|
||||||
|
|
||||||
|
Validate the output buffer length for L2CAP config requests and responses
|
||||||
|
to avoid overflowing the stack buffer used for building the option blocks.
|
||||||
|
|
||||||
|
Signed-off-by: Ben Seri <ben@armis.com>
|
||||||
|
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||||
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
net/bluetooth/l2cap_core.c | 80 ++++++++++++++++++++++++---------------------
|
||||||
|
1 file changed, 43 insertions(+), 37 deletions(-)
|
||||||
|
|
||||||
|
--- a/net/bluetooth/l2cap_core.c
|
||||||
|
+++ b/net/bluetooth/l2cap_core.c
|
||||||
|
@@ -58,7 +58,7 @@ static struct sk_buff *l2cap_build_cmd(s
|
||||||
|
u8 code, u8 ident, u16 dlen, void *data);
|
||||||
|
static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len,
|
||||||
|
void *data);
|
||||||
|
-static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data);
|
||||||
|
+static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data_size);
|
||||||
|
static void l2cap_send_disconn_req(struct l2cap_chan *chan, int err);
|
||||||
|
|
||||||
|
static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
|
||||||
|
@@ -1473,7 +1473,7 @@ static void l2cap_conn_start(struct l2ca
|
||||||
|
|
||||||
|
set_bit(CONF_REQ_SENT, &chan->conf_state);
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf), buf);
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2987,12 +2987,15 @@ static inline int l2cap_get_conf_opt(voi
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
|
||||||
|
+static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val, size_t size)
|
||||||
|
{
|
||||||
|
struct l2cap_conf_opt *opt = *ptr;
|
||||||
|
|
||||||
|
BT_DBG("type 0x%2.2x len %u val 0x%lx", type, len, val);
|
||||||
|
|
||||||
|
+ if (size < L2CAP_CONF_OPT_SIZE + len)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
opt->type = type;
|
||||||
|
opt->len = len;
|
||||||
|
|
||||||
|
@@ -3017,7 +3020,7 @@ static void l2cap_add_conf_opt(void **pt
|
||||||
|
*ptr += L2CAP_CONF_OPT_SIZE + len;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
|
||||||
|
+static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan, size_t size)
|
||||||
|
{
|
||||||
|
struct l2cap_conf_efs efs;
|
||||||
|
|
||||||
|
@@ -3045,7 +3048,7 @@ static void l2cap_add_opt_efs(void **ptr
|
||||||
|
}
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(ptr, L2CAP_CONF_EFS, sizeof(efs),
|
||||||
|
- (unsigned long) &efs);
|
||||||
|
+ (unsigned long) &efs, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void l2cap_ack_timeout(struct work_struct *work)
|
||||||
|
@@ -3191,11 +3194,12 @@ static inline void l2cap_txwin_setup(str
|
||||||
|
chan->ack_win = chan->tx_win;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data)
|
||||||
|
+static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data_size)
|
||||||
|
{
|
||||||
|
struct l2cap_conf_req *req = data;
|
||||||
|
struct l2cap_conf_rfc rfc = { .mode = chan->mode };
|
||||||
|
void *ptr = req->data;
|
||||||
|
+ void *endptr = data + data_size;
|
||||||
|
u16 size;
|
||||||
|
|
||||||
|
BT_DBG("chan %p", chan);
|
||||||
|
@@ -3220,7 +3224,7 @@ static int l2cap_build_conf_req(struct l
|
||||||
|
|
||||||
|
done:
|
||||||
|
if (chan->imtu != L2CAP_DEFAULT_MTU)
|
||||||
|
- l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu);
|
||||||
|
+ l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu, endptr - ptr);
|
||||||
|
|
||||||
|
switch (chan->mode) {
|
||||||
|
case L2CAP_MODE_BASIC:
|
||||||
|
@@ -3239,7 +3243,7 @@ done:
|
||||||
|
rfc.max_pdu_size = 0;
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
|
||||||
|
- (unsigned long) &rfc);
|
||||||
|
+ (unsigned long) &rfc, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_MODE_ERTM:
|
||||||
|
@@ -3259,21 +3263,21 @@ done:
|
||||||
|
L2CAP_DEFAULT_TX_WINDOW);
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
|
||||||
|
- (unsigned long) &rfc);
|
||||||
|
+ (unsigned long) &rfc, endptr - ptr);
|
||||||
|
|
||||||
|
if (test_bit(FLAG_EFS_ENABLE, &chan->flags))
|
||||||
|
- l2cap_add_opt_efs(&ptr, chan);
|
||||||
|
+ l2cap_add_opt_efs(&ptr, chan, endptr - ptr);
|
||||||
|
|
||||||
|
if (test_bit(FLAG_EXT_CTRL, &chan->flags))
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
|
||||||
|
- chan->tx_win);
|
||||||
|
+ chan->tx_win, endptr - ptr);
|
||||||
|
|
||||||
|
if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
|
||||||
|
if (chan->fcs == L2CAP_FCS_NONE ||
|
||||||
|
test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
|
||||||
|
chan->fcs = L2CAP_FCS_NONE;
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
|
||||||
|
- chan->fcs);
|
||||||
|
+ chan->fcs, endptr - ptr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -3291,17 +3295,17 @@ done:
|
||||||
|
rfc.max_pdu_size = cpu_to_le16(size);
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
|
||||||
|
- (unsigned long) &rfc);
|
||||||
|
+ (unsigned long) &rfc, endptr - ptr);
|
||||||
|
|
||||||
|
if (test_bit(FLAG_EFS_ENABLE, &chan->flags))
|
||||||
|
- l2cap_add_opt_efs(&ptr, chan);
|
||||||
|
+ l2cap_add_opt_efs(&ptr, chan, endptr - ptr);
|
||||||
|
|
||||||
|
if (chan->conn->feat_mask & L2CAP_FEAT_FCS)
|
||||||
|
if (chan->fcs == L2CAP_FCS_NONE ||
|
||||||
|
test_bit(CONF_RECV_NO_FCS, &chan->conf_state)) {
|
||||||
|
chan->fcs = L2CAP_FCS_NONE;
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,
|
||||||
|
- chan->fcs);
|
||||||
|
+ chan->fcs, endptr - ptr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
@@ -3312,10 +3316,11 @@ done:
|
||||||
|
return ptr - data;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data)
|
||||||
|
+static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data_size)
|
||||||
|
{
|
||||||
|
struct l2cap_conf_rsp *rsp = data;
|
||||||
|
void *ptr = rsp->data;
|
||||||
|
+ void *endptr = data + data_size;
|
||||||
|
void *req = chan->conf_req;
|
||||||
|
int len = chan->conf_len;
|
||||||
|
int type, hint, olen;
|
||||||
|
@@ -3417,7 +3422,7 @@ done:
|
||||||
|
return -ECONNREFUSED;
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
|
||||||
|
- (unsigned long) &rfc);
|
||||||
|
+ (unsigned long) &rfc, endptr - ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result == L2CAP_CONF_SUCCESS) {
|
||||||
|
@@ -3430,7 +3435,7 @@ done:
|
||||||
|
chan->omtu = mtu;
|
||||||
|
set_bit(CONF_MTU_DONE, &chan->conf_state);
|
||||||
|
}
|
||||||
|
- l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->omtu);
|
||||||
|
+ l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->omtu, endptr - ptr);
|
||||||
|
|
||||||
|
if (remote_efs) {
|
||||||
|
if (chan->local_stype != L2CAP_SERV_NOTRAFIC &&
|
||||||
|
@@ -3444,7 +3449,7 @@ done:
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
|
||||||
|
sizeof(efs),
|
||||||
|
- (unsigned long) &efs);
|
||||||
|
+ (unsigned long) &efs, endptr - ptr);
|
||||||
|
} else {
|
||||||
|
/* Send PENDING Conf Rsp */
|
||||||
|
result = L2CAP_CONF_PENDING;
|
||||||
|
@@ -3477,7 +3482,7 @@ done:
|
||||||
|
set_bit(CONF_MODE_DONE, &chan->conf_state);
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
|
||||||
|
- sizeof(rfc), (unsigned long) &rfc);
|
||||||
|
+ sizeof(rfc), (unsigned long) &rfc, endptr - ptr);
|
||||||
|
|
||||||
|
if (test_bit(FLAG_EFS_ENABLE, &chan->flags)) {
|
||||||
|
chan->remote_id = efs.id;
|
||||||
|
@@ -3491,7 +3496,7 @@ done:
|
||||||
|
le32_to_cpu(efs.sdu_itime);
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
|
||||||
|
sizeof(efs),
|
||||||
|
- (unsigned long) &efs);
|
||||||
|
+ (unsigned long) &efs, endptr - ptr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -3505,7 +3510,7 @@ done:
|
||||||
|
set_bit(CONF_MODE_DONE, &chan->conf_state);
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),
|
||||||
|
- (unsigned long) &rfc);
|
||||||
|
+ (unsigned long) &rfc, endptr - ptr);
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -3527,10 +3532,11 @@ done:
|
||||||
|
}
|
||||||
|
|
||||||
|
static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
|
||||||
|
- void *data, u16 *result)
|
||||||
|
+ void *data, size_t size, u16 *result)
|
||||||
|
{
|
||||||
|
struct l2cap_conf_req *req = data;
|
||||||
|
void *ptr = req->data;
|
||||||
|
+ void *endptr = data + size;
|
||||||
|
int type, olen;
|
||||||
|
unsigned long val;
|
||||||
|
struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
|
||||||
|
@@ -3548,13 +3554,13 @@ static int l2cap_parse_conf_rsp(struct l
|
||||||
|
chan->imtu = L2CAP_DEFAULT_MIN_MTU;
|
||||||
|
} else
|
||||||
|
chan->imtu = val;
|
||||||
|
- l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu);
|
||||||
|
+ l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, chan->imtu, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_CONF_FLUSH_TO:
|
||||||
|
chan->flush_to = val;
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO,
|
||||||
|
- 2, chan->flush_to);
|
||||||
|
+ 2, chan->flush_to, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_CONF_RFC:
|
||||||
|
@@ -3568,13 +3574,13 @@ static int l2cap_parse_conf_rsp(struct l
|
||||||
|
chan->fcs = 0;
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
|
||||||
|
- sizeof(rfc), (unsigned long) &rfc);
|
||||||
|
+ sizeof(rfc), (unsigned long) &rfc, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_CONF_EWS:
|
||||||
|
chan->ack_win = min_t(u16, val, chan->ack_win);
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
|
||||||
|
- chan->tx_win);
|
||||||
|
+ chan->tx_win, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_CONF_EFS:
|
||||||
|
@@ -3587,7 +3593,7 @@ static int l2cap_parse_conf_rsp(struct l
|
||||||
|
return -ECONNREFUSED;
|
||||||
|
|
||||||
|
l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS, sizeof(efs),
|
||||||
|
- (unsigned long) &efs);
|
||||||
|
+ (unsigned long) &efs, endptr - ptr);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case L2CAP_CONF_FCS:
|
||||||
|
@@ -3692,7 +3698,7 @@ void __l2cap_connect_rsp_defer(struct l2
|
||||||
|
return;
|
||||||
|
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf), buf);
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3900,7 +3906,7 @@ sendresp:
|
||||||
|
u8 buf[128];
|
||||||
|
set_bit(CONF_REQ_SENT, &chan->conf_state);
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf), buf);
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3978,7 +3984,7 @@ static int l2cap_connect_create_rsp(stru
|
||||||
|
break;
|
||||||
|
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, req), req);
|
||||||
|
+ l2cap_build_conf_req(chan, req, sizeof(req)), req);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -4090,7 +4096,7 @@ static inline int l2cap_config_req(struc
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Complete config. */
|
||||||
|
- len = l2cap_parse_conf_req(chan, rsp);
|
||||||
|
+ len = l2cap_parse_conf_req(chan, rsp, sizeof(rsp));
|
||||||
|
if (len < 0) {
|
||||||
|
l2cap_send_disconn_req(chan, ECONNRESET);
|
||||||
|
goto unlock;
|
||||||
|
@@ -4124,7 +4130,7 @@ static inline int l2cap_config_req(struc
|
||||||
|
if (!test_and_set_bit(CONF_REQ_SENT, &chan->conf_state)) {
|
||||||
|
u8 buf[64];
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf), buf);
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -4184,7 +4190,7 @@ static inline int l2cap_config_rsp(struc
|
||||||
|
char buf[64];
|
||||||
|
|
||||||
|
len = l2cap_parse_conf_rsp(chan, rsp->data, len,
|
||||||
|
- buf, &result);
|
||||||
|
+ buf, sizeof(buf), &result);
|
||||||
|
if (len < 0) {
|
||||||
|
l2cap_send_disconn_req(chan, ECONNRESET);
|
||||||
|
goto done;
|
||||||
|
@@ -4214,7 +4220,7 @@ static inline int l2cap_config_rsp(struc
|
||||||
|
/* throw out any old stored conf requests */
|
||||||
|
result = L2CAP_CONF_SUCCESS;
|
||||||
|
len = l2cap_parse_conf_rsp(chan, rsp->data, len,
|
||||||
|
- req, &result);
|
||||||
|
+ req, sizeof(req), &result);
|
||||||
|
if (len < 0) {
|
||||||
|
l2cap_send_disconn_req(chan, ECONNRESET);
|
||||||
|
goto done;
|
||||||
|
@@ -4791,7 +4797,7 @@ static void l2cap_do_create(struct l2cap
|
||||||
|
set_bit(CONF_REQ_SENT, &chan->conf_state);
|
||||||
|
l2cap_send_cmd(chan->conn, l2cap_get_ident(chan->conn),
|
||||||
|
L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf), buf);
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)), buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -7465,7 +7471,7 @@ static void l2cap_security_cfm(struct hc
|
||||||
|
set_bit(CONF_REQ_SENT, &chan->conf_state);
|
||||||
|
l2cap_send_cmd(conn, l2cap_get_ident(conn),
|
||||||
|
L2CAP_CONF_REQ,
|
||||||
|
- l2cap_build_conf_req(chan, buf),
|
||||||
|
+ l2cap_build_conf_req(chan, buf, sizeof(buf)),
|
||||||
|
buf);
|
||||||
|
chan->num_conf_req++;
|
||||||
|
}
|
14
kernel.spec
14
kernel.spec
|
@ -646,6 +646,15 @@ Patch617: Fix-for-module-sig-verification.patch
|
||||||
# rhbz 1485086
|
# rhbz 1485086
|
||||||
Patch619: pci-mark-amd-stoney-gpu-ats-as-broken.patch
|
Patch619: pci-mark-amd-stoney-gpu-ats-as-broken.patch
|
||||||
|
|
||||||
|
# CVE-2017-12154 rhbz 1491224 1491231
|
||||||
|
Patch620: kvm-nVMX-Don-t-allow-L2-to-access-the-hardware-CR8.patch
|
||||||
|
|
||||||
|
# CVE-2017-12153 rhbz 1491046 1491057
|
||||||
|
Patch621: nl80211-check-for-the-required-netlink-attributes-presence.patch
|
||||||
|
|
||||||
|
# CVE-2017-1000251 rhbz 1489716 1490906
|
||||||
|
Patch622: bluetooth-properly-check-l2cap-config-option-output-buffer-length.patch
|
||||||
|
|
||||||
# END OF PATCH DEFINITIONS
|
# END OF PATCH DEFINITIONS
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@ -2219,6 +2228,11 @@ fi
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 13 2017 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||||
|
- Fix CVE-2017-12154 (rhbz 1491224 1491231)
|
||||||
|
- Fix CVE-2017-12153 (rhbz 1491046 1491057)
|
||||||
|
- Fix CVE-2017-1000251 (rhbz 1489716 1490906)
|
||||||
|
|
||||||
* Sun Sep 10 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.1-200
|
* Sun Sep 10 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.1-200
|
||||||
- Linux v4.13.1
|
- Linux v4.13.1
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
From patchwork Tue Sep 12 20:02:54 2017
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: kvm: nVMX: Don't allow L2 to access the hardware CR8
|
||||||
|
From: Jim Mattson <jmattson@google.com>
|
||||||
|
X-Patchwork-Id: 9950035
|
||||||
|
Message-Id: <20170912200254.111560-1-jmattson@google.com>
|
||||||
|
To: kvm@vger.kernel.org, P J P <ppandit@redhat.com>,
|
||||||
|
Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Cc: Jim Mattson <jmattson@google.com>
|
||||||
|
Date: Tue, 12 Sep 2017 13:02:54 -0700
|
||||||
|
|
||||||
|
If L1 does not specify the "use TPR shadow" VM-execution control in
|
||||||
|
vmcs12, then L0 must specify the "CR8-load exiting" and "CR8-store
|
||||||
|
exiting" VM-execution controls in vmcs02. Failure to do so will give
|
||||||
|
the L2 VM unrestricted read/write access to the hardware CR8.
|
||||||
|
|
||||||
|
This fixes CVE-2017-12154.
|
||||||
|
|
||||||
|
Signed-off-by: Jim Mattson <jmattson@google.com>
|
||||||
|
---
|
||||||
|
arch/x86/kvm/vmx.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
|
||||||
|
index c6efc1f88b25..885b7eed4320 100644
|
||||||
|
--- a/arch/x86/kvm/vmx.c
|
||||||
|
+++ b/arch/x86/kvm/vmx.c
|
||||||
|
@@ -10525,6 +10525,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
|
||||||
|
if (exec_control & CPU_BASED_TPR_SHADOW) {
|
||||||
|
vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, -1ull);
|
||||||
|
vmcs_write32(TPR_THRESHOLD, vmcs12->tpr_threshold);
|
||||||
|
+ } else {
|
||||||
|
+#ifdef CONFIG_X86_64
|
||||||
|
+ exec_control |= CPU_BASED_CR8_LOAD_EXITING |
|
||||||
|
+ CPU_BASED_CR8_STORE_EXITING;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
|
@ -0,0 +1,46 @@
|
||||||
|
From patchwork Tue Sep 12 22:21:21 2017
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: nl80211: check for the required netlink attributes presence
|
||||||
|
From: Vladis Dronov <vdronov@redhat.com>
|
||||||
|
X-Patchwork-Id: 9950281
|
||||||
|
Message-Id: <20170912222121.5032-1-vdronov@redhat.com>
|
||||||
|
To: Johannes Berg <johannes.berg@intel.com>,
|
||||||
|
Johannes Berg <johannes@sipsolutions.net>,
|
||||||
|
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
|
||||||
|
Cc: Vladis Dronov <vdronov@redhat.com>, "# v3 . 1-rc1" <stable@vger.kernel.org>
|
||||||
|
Date: Wed, 13 Sep 2017 00:21:21 +0200
|
||||||
|
|
||||||
|
nl80211_set_rekey_data() does not check if the required attributes
|
||||||
|
NL80211_REKEY_DATA_{REPLAY_CTR,KEK,KCK} are present when processing
|
||||||
|
NL80211_CMD_SET_REKEY_OFFLOAD request. This request can be issued by
|
||||||
|
users with CAP_NET_ADMIN privilege and may result in NULL dereference
|
||||||
|
and a system crash. Add a check for the required attributes presence.
|
||||||
|
This patch is based on the patch by bo Zhang.
|
||||||
|
|
||||||
|
This fixes CVE-2017-12153.
|
||||||
|
|
||||||
|
References: https://bugzilla.redhat.com/show_bug.cgi?id=1491046
|
||||||
|
Fixes: e5497d766ad ("cfg80211/nl80211: support GTK rekey offload")
|
||||||
|
Cc: <stable@vger.kernel.org> # v3.1-rc1
|
||||||
|
Reported-by: bo Zhang <zhangbo5891001@gmail.com>
|
||||||
|
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
|
||||||
|
---
|
||||||
|
net/wireless/nl80211.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
|
||||||
|
index 0df8023..fbd5593 100644
|
||||||
|
--- a/net/wireless/nl80211.c
|
||||||
|
+++ b/net/wireless/nl80211.c
|
||||||
|
@@ -10903,6 +10903,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)
|
||||||
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
+ if (!tb[NL80211_REKEY_DATA_REPLAY_CTR] || !tb[NL80211_REKEY_DATA_KEK] ||
|
||||||
|
+ !tb[NL80211_REKEY_DATA_KCK])
|
||||||
|
+ return -EINVAL;
|
||||||
|
if (nla_len(tb[NL80211_REKEY_DATA_REPLAY_CTR]) != NL80211_REPLAY_CTR_LEN)
|
||||||
|
return -ERANGE;
|
||||||
|
if (nla_len(tb[NL80211_REKEY_DATA_KEK]) != NL80211_KEK_LEN)
|
Loading…
Reference in New Issue