5a2a43fcb1
fix submodule slirp cve-2021-3592 cve-2021-3593 and cve-2021-3595 Signed-off-by: imxcc <xingchaochao@huawei.com> Signed-off-by: bobychen <boby.chen@huawei.com>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From ab454ca5f45a842b2517a0f4eb786b6ea3019d5a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Fri, 4 Jun 2021 16:15:14 +0400
|
|
Subject: [PATCH 3/6] bootp: check bootp_input buffer size
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Fixes: CVE-2021-3592
|
|
Fixes: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/44
|
|
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: imxcc <xingchaochao@huawei.com>
|
|
---
|
|
slirp/src/bootp.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c
|
|
index 57543271..57891871 100644
|
|
--- a/slirp/src/bootp.c
|
|
+++ b/slirp/src/bootp.c
|
|
@@ -366,9 +366,9 @@ udp_output(NULL, m, &saddr, &daddr, IPTOS_LOWDELAY);
|
|
|
|
void bootp_input(struct mbuf *m)
|
|
{
|
|
- struct bootp_t *bp = mtod(m, struct bootp_t *);
|
|
+ struct bootp_t *bp = mtod_check(m, sizeof(struct bootp_t));
|
|
|
|
- if (bp->bp_op == BOOTP_REQUEST) {
|
|
+ if (bp && bp->bp_op == BOOTP_REQUEST) {
|
|
bootp_reply(m->slirp, bp, m_end(m));
|
|
}
|
|
}
|
|
--
|
|
2.27.0
|
|
|