Skip to contentSkip to conversation

qemu: Fix DHCP broken in libslirp

PATCH In review Zhang, Qiang 2 participants 2 messages Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu: Fix DHCP broken in libslirp

From: Zqiang <[email protected]>

Fix issue 48
Reference to upstream patch:
https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c9f314f6e315a5518432761fea864196a290f799

---
 meta/recipes-devtools/qemu/qemu.inc           |  1 +
 ...1-Fix-DHCP-broken-in-libslirp-v4.6.0.patch | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
index 3921546df7..bed175e59d 100644
@@ -57,6 +57,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://CVE-2020-27821.patch \
            file://CVE-2021-20263.patch \
            file://CVE-2021-3392.patch \
+           file://0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch \
            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch new file +32 -0
new file mode 100644
index 0000000000..480dcee05e
@@ -0,0 +1,32 @@
+From c9f314f6e315a5518432761fea864196a290f799 Mon Sep 17 00:00:00 2001
+From: Akihiro Suda <[email protected]>
+Date: Thu, 17 Jun 2021 18:01:32 +0900
+Subject: [PATCH] Fix "DHCP broken in libslirp v4.6.0"
+
+Fix issue 48
+Reference to upstream patch:
+https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c9f314f6e315a5518432761fea864196a290f799
+
+Signed-off-by: Akihiro Suda <[email protected]>
+---
+ src/bootp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootp.c b/src/bootp.c
+index cafa1eb..0a35873 100644
+--- a/slirp/src/bootp.c
++++ b/slirp/src/bootp.c
+@@ -359,7 +359,9 @@ static void bootp_reply(Slirp *slirp,
+ 
+     daddr.sin_addr.s_addr = 0xffffffffu;
+ 
+-    m->m_len = sizeof(struct bootp_t) - sizeof(struct ip) - sizeof(struct udphdr);
++    assert ((q - rbp->bp_vend + 1) <= DHCP_OPT_LEN);
++
++    m->m_len = sizeof(struct bootp_t) + (q - rbp->bp_vend + 1) - sizeof(struct ip) - sizeof(struct udphdr);
+     udp_output(NULL, m, &saddr, &daddr, IPTOS_LOWDELAY);
+ }
+ 
+-- 
+2.17.1
+
Signature · 1 line
2.17.1
#1 lore raw
Quoted 38 lines · On Wed, 2021-08-04 at 14:24 +0800, [email protected] wrote:

From: Zqiang <[email protected]>

Fix issue 48
Reference to upstream patch:
https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c9f314f6e315a5518432761fea864196a290f799

---
 meta/recipes-devtools/qemu/qemu.inc | 1 +
 ...1-Fix-DHCP-broken-in-libslirp-v4.6.0.patch | 32 +++++++++++++++++++

 2 files changed, 33 insertions(+)

 create mode 100644 meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch

meta/recipes-devtools/qemu/qemu.inc +1 -0
index 3921546df7..bed175e59d 100644
@@ -57,6 +57,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
             file://CVE-2020-27821.patch \
             file://CVE-2021-20263.patch \
             file://CVE-2021-3392.patch \
+           file://0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch \

            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"

meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch new file +0 -0
new file mode 100644
index 0000000000..480dcee05e

meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch line 8

Quoted 8 lines
meta/recipes-devtools/qemu/qemu/0001-Fix-DHCP-broken-in-libslirp-v4.6.0.patch new file +8 -0
@@ -0,0 +1,32 @@
+From c9f314f6e315a5518432761fea864196a290f799 Mon Sep 17 00:00:00 2001
+From: Akihiro Suda <[email protected]>
+Date: Thu, 17 Jun 2021 18:01:32 +0900
+Subject: [PATCH] Fix "DHCP broken in libslirp v4.6.0"
+
+Fix issue 48
+Reference to upstream patch:
+https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c9f314f6e315a5518432761fea864196a290f799

This needs to be in our standard form (Upstream-Status:).

Cheers,

Richard