Updated libslirp to version 4.6.1

Author: FrodeSolheim

ChangeLog

@@ -1,5 +1,6 @@
 Version 4.0.x:
 
+* Updated libslirp to version 4.6.1.
 * Device helper is updated to work with new hotplug functionality in
   FS-UAE Launcher.
 * Fix device helper for xinput devices with recent SDL2 versions.

Makefile.am

@@ -1292,49 +1292,8 @@ endif
 if WITH_SLIRP
 if WITH_BUILTIN_SLIRP
 noinst_LIBRARIES += libslirp.a
-# AM_CPPFLAGS += -I$(s)/src/slirp/include
 fs_uae_LDADD += libslirp.a
-# libslirp_a_SOURCES = \
-# 	src/slirp/bootp.cpp \
-# 	src/slirp/bootp.h \
-# 	src/slirp/cksum.cpp \
-# 	src/slirp/ctl.h \
-# 	src/slirp/debug.h \
-# 	src/slirp/icmp_var.h \
-# 	src/slirp/if.cpp \
-# 	src/slirp/if.h \
-# 	src/slirp/ip.h \
-# 	src/slirp/ip_icmp.cpp \
-# 	src/slirp/ip_icmp.h \
-# 	src/slirp/ip_input.cpp \
-# 	src/slirp/ip_output.cpp \
-# 	src/slirp/libslirp.h \
-# 	src/slirp/main.h \
-# 	src/slirp/mbuf.cpp \
-# 	src/slirp/mbuf.h \
-# 	src/slirp/misc.cpp \
-# 	src/slirp/misc.h \
-# 	src/slirp/sbuf.cpp \
-# 	src/slirp/sbuf.h \
-# 	src/slirp/slirp.cpp \
-# 	src/slirp/slirp.h \
-# 	src/slirp/slirp_config.h \
-# 	src/slirp/slirpdebug.cpp \
-# 	src/slirp/socket.cpp \
-# 	src/slirp/socket.h \
-# 	src/slirp/tcp.h \
-# 	src/slirp/tcp_input.cpp \
-# 	src/slirp/tcp_output.cpp \
-# 	src/slirp/tcp_subr.cpp \
-# 	src/slirp/tcp_timer.cpp \
-# 	src/slirp/tcp_timer.h \
-# 	src/slirp/tcp_var.h \
-# 	src/slirp/tcpip.h \
-# 	src/slirp/tftp.cpp \
-# 	src/slirp/tftp.h \
-# 	src/slirp/udp.cpp \
-# 	src/slirp/udp.h
-
+LIBS += @SLIRP_LIBS@
 libslirp_a_SOURCES = \
 	slirp/src/arp_table.c \
 	slirp/src/bootp.c \

configure.ac

@@ -396,6 +396,7 @@ AC_SUBST([OS_NAME])
 AC_SUBST([OS_NAME_2])
 AC_SUBST([OS_NAME_3])
 AC_SUBST([PACKAGE_ARCH])
+AC_SUBST([SLIRP_LIBS])
 AC_SUBST([HOST_OS], $host_os)
 AC_SUBST([HOST_CPU], $host_cpu)
 AS_CASE([$host_os],
@@ -433,6 +434,7 @@ AS_CASE([$host_os],
     ], [
         OS_LDFLAGS="-headerpad_max_install_names -rpath @executable_path/../Frameworks"
     ])
+    SLIRP_LIBS="-lresolv"
 ],
 [freebsd*], [
     OS_NAME="freebsd"

slirp/.gitignore

@@ -4,6 +4,7 @@
 *.gcov
 *.lib
 *.obj
+/build/
 /TAGS
 /cscope*
 /tags

slirp/.gitlab-ci.yml

@@ -1,13 +1,14 @@
 image: fedora:latest
 
 variables:
-  DEPS: meson ninja-build make
+  DEPS: meson ninja-build
         gcc pkg-config glib2-devel
         mingw64-gcc mingw64-pkg-config mingw64-glib2
         clang-analyzer git-core
 
 before_script:
   - dnf install -y $DEPS
+  - git fetch --tags https://gitlab.freedesktop.org/slirp/libslirp.git
   - git describe
 
 build:
@@ -22,6 +23,21 @@ build-mingw64:
     - (mkdir buildw && cd buildw && mingw64-meson --werror) || (cat buildw/meson-logs/meson-log.txt && exit 1)
     - ninja -C buildw
 
-build-qemu:
+Coverity:
+  only:
+    refs:
+      - master
+      - coverity
   script:
-    - make BUILD_DIR=build
+  - dnf update -y
+  - dnf install -y curl clang
+  - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64
+    --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN
+  - tar xfz /tmp/cov-analysis-linux64.tgz
+  - CC=clang meson build
+  - cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C build
+  - tar cfz cov-int.tar.gz cov-int
+  - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
+    --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
+    --form [email protected] --form version="`git describe --tags`"
+    --form description="`git describe --tags` / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID "

slirp/CHANGELOG.md

@@ -5,29 +5,119 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [4.6.1] - 2021-06-18
+
+### Fixed
+
+ - Fix DHCP regression introduced in 4.6.0. !95
+
+## [4.6.0] - 2021-06-14
 
 ### Added
 
+ - mbuf: Add debugging helpers for allocation. !90
+
 ### Changed
 
-### Deprecated
+ -  Revert "Set macOS deployment target to macOS 10.4". !93
+
+### Fixed
+
+ - mtod()-related buffer overflows (CVE-2021-3592 #44, CVE-2021-3593 #45,
+   CVE-2021-3594 #47, CVE-2021-3595 #46).
+ - poll_fd: add missing fd registration for UDP and ICMP
+ - ncsi: make ncsi_calculate_checksum work with unaligned data. !89
+ - Various typos and doc fixes. !88
+
+## [4.5.0] - 2021-05-18
+
+### Added
+
+ - IPv6 forwarding. !62 !75 !77
+ - slirp_neighbor_info() to dump the ARP/NDP tables. !71
+
+### Changed
+
+ - Lazy guest address resolution for IPv6. !81
+ - Improve signal handling when spawning a child. !61
+ - Set macOS deployment target to macOS 10.4. !72
+ - slirp_add_hostfwd: Ensure all error paths set errno. !80
+ - More API documentation.
+
+### Fixed
+
+ - Assertion failure on unspecified IPv6 address. !86
+ - Disable polling for PRI on MacOS, fixing some closing streams issues. !73 
+ - Various memory leak fixes on fastq/batchq. !68
+ - Memory leak on IPv6 fast-send. !67
+ - Slow socket response on Windows. !64
+ - Misc build and code cleanups. !60 !63 !76 !79 !84
+
+## [4.4.0] - 2020-12-02
+
+### Added
+
+ - udp, udp6, icmp: handle TTL value. !48
+ - Enable forwarding ICMP errors. !49
+ - Add DNS resolving for iOS. !54
+
+### Changed
+
+ - Improve meson subproject() support. !53
+ - Removed Makefile-based build system. !56
+
+### Fixed
+
+ - socket: consume empty packets. !55
+ - check pkt_len before reading protocol header (CVE-2020-29129). !57
+ - ip_stripoptions use memmove (fixes undefined behaviour). !47
+ - various Coverity-related changes/fixes.
+
+## [4.3.1] - 2020-07-08
+
+### Changed
+
+ - A silent truncation could occur in `slirp_fmt()`, which will now print a
+   critical message. See also #22.
 
 ### Fixed
 
+ - CVE-2020-10756 - Drop bogus IPv6 messages that could lead to data leakage.
+   See !44 and !42.
+ - Fix win32 builds by using the SLIRP_PACKED definition.
+ - Various coverity scan errors fixed. !41
+ - Fix new GCC warnings. !43
+
+## [4.3.0] - 2020-04-22
+
+### Added
+
+ - `SLIRP_VERSION_STRING` macro, with the git sha suffix when building from git
+ - `SlirpConfig.disable_dns`, to disable DNS redirection #16
+
+### Changed
+
+ - `slirp_version_string()` now has the git sha suffix when building form git
+ - Limit DNS redirection to port 53 #16
+
+### Fixed
+
+ - Fix build regression with mingw & NetBSD
+ - Fix use-afte-free in `ip_reass()` (CVE-2020-1983)
+
 ## [4.2.0] - 2020-03-17
 
 ### Added
 
  - New API function `slirp_add_unix`: add a forward rule to a Unix socket.
  - New API function `slirp_remove_guestfwd`: remove a forward rule previously
    added by `slirp_add_exec`, `slirp_add_unix` or `slirp_add_guestfwd`
- - New SlirpConfig.outbound_addr{,6} fields to bind output socket to a
+ - New `SlirpConfig.outbound_addr{,6}` fields to bind output socket to a
    specific address
 
 ### Changed
 
- - socket: do not fallback on host loopback if get_dns_addr() failed
+ - socket: do not fallback on host loopback if `get_dns_addr()` failed
    or the address is in slirp network
 
 ### Fixed
@@ -82,7 +172,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Standalone project, removing any QEMU dependency.
  - License clarifications.
 
-[unreleased]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.2.0...master
+[Unreleased]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.6.1...master
+[4.6.1]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.6.0...v4.6.1
+[4.6.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.5.0...v4.6.0
+[4.5.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.4.0...v4.5.0
+[4.4.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.3.1...v4.4.0
+[4.3.1]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.3.0...v4.3.1
+[4.3.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.2.0...v4.3.0
 [4.2.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.1.0...v4.2.0
 [4.1.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.0.0...v4.1.0
 [4.0.0]: https://gitlab.freedesktop.org/slirp/libslirp/commits/v4.0.0

slirp/Makefile

@@ -60,7 +60,3 @@ print-%:
 .SUFFIXES:
 
 -include $(DEPS)
-
-distdir:
-
-distclean: clean

slirp/README.md

@@ -7,7 +7,7 @@ containers or various tools.
 
 ### Prerequisites
 
-A C compiler, make/meson and glib2 development libraries.
+A C compiler, meson and glib2 development libraries.
 
 (see also [.gitlab-ci.yml](.gitlab-ci.yml) DEPS variable for the list
 of dependencies on Fedora)