[Slirp] [Git][slirp/libslirp][master] 2 commits: Fix "DHCP broken in libslirp v4.6.0"

[Marc-André Lureau (@elmarco)]

Marc-André Lureau pushed to branch master at slirp / libslirp


Commits:
c9f314f6 by Akihiro Suda at 2021-06-18T16:39:56+09:00
Fix "DHCP broken in libslirp v4.6.0"

Fix issue 48

Signed-off-by: Akihiro Suda <akihiro.suda.cz at hco.ntt.co.jp>

- - - - -
76da4cca by Marc-André Lureau at 2021-06-18T07:43:21+00:00
Merge branch 'fix-48' into 'master'

Fix "DHCP broken in libslirp v4.6.0"

Closes #48

See merge request slirp/libslirp!95
- - - - -


1 changed file:

- src/bootp.c


Changes:

=====================================
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);
 }
 



View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/6ef66db79938d763212320c1b64bc562c23d25a8...76da4cca02e8dbdcb60e6365576073017f652293

-- 
View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/6ef66db79938d763212320c1b64bc562c23d25a8...76da4cca02e8dbdcb60e6365576073017f652293
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/slirp/attachments/20210618/e7328fc5/attachment.htm>