[PATCH] slirp: update to v4.3.1

[PATCH] slirp: update to v4.3.1

[Marc-André Lureau]

Switch from stable-4.2 branch back to master (which is actually
maintained, I think we tend to forget about stable...).

git shortlog 2faae0f7..a62d3673:

5eraph (2):
      disable_dns option
      limit vnameserver_addr to port 53

Akihiro Suda (1):
      libslirp.h: fix SlirpConfig v3 documentation

Jindrich Novy (4):
      Fix possible infinite loops and use-after-free
      Use secure string copy to avoid overflow
      Be sure to initialize sockaddr structure
      Check lseek() for failure

Marc-André Lureau (12):
      Merge branch 'master' into 'master'
      Merge branch 'fix-slirpconfig-3-doc' into 'master'
      Fix use-afte-free in ip_reass() (CVE-2020-1983)
      Update CHANGELOG
      Merge branch 'cve-2020-1983' into 'master'
      Release v4.3.0
      Merge branch 'release-v4.3.0' into 'master'
      changelog: post-release
      util: do not silently truncate
      Merge branch 'slirp-fmt-truncate' into 'master'
      Release v4.3.1
      Merge branch 'release-v4.3.1' into 'master'

Philippe Mathieu-Daudé (3):
      Fix win32 builds by using the SLIRP_PACKED definition
      Fix constness warnings
      Remove unnecessary break

Ralf Haferkamp (2):
      Drop bogus IPv6 messages
      Fix MTU check

Samuel Thibault (1):
      Merge branch 'ip6_payload_len' into 'master'

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 slirp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slirp b/slirp
index 2faae0f778f..a62d36734ff 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 2faae0f778f818fadc873308f983289df697eb93
+Subproject commit a62d36734ffe9828d0f70df1b3898a3b4fbda755
-- 
2.27.0.221.ga08a83db2b

Re: [PATCH] slirp: update to v4.3.1

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 2142 bytes --]

Hi


On Mon, Jul 13, 2020 at 12:33 PM Marc-André Lureau <
marcandre.lureau@redhat.com> wrote:

> Switch from stable-4.2 branch back to master (which is actually
> maintained, I think we tend to forget about stable...).
>

ping

Peter, should I send a pull request directly?

(I feel like it should be part of rc0, since it has a few new
functionality/API...)


>
> git shortlog 2faae0f7..a62d3673:
>
> 5eraph (2):
>       disable_dns option
>       limit vnameserver_addr to port 53
>
> Akihiro Suda (1):
>       libslirp.h: fix SlirpConfig v3 documentation
>
> Jindrich Novy (4):
>       Fix possible infinite loops and use-after-free
>       Use secure string copy to avoid overflow
>       Be sure to initialize sockaddr structure
>       Check lseek() for failure
>
> Marc-André Lureau (12):
>       Merge branch 'master' into 'master'
>       Merge branch 'fix-slirpconfig-3-doc' into 'master'
>       Fix use-afte-free in ip_reass() (CVE-2020-1983)
>       Update CHANGELOG
>       Merge branch 'cve-2020-1983' into 'master'
>       Release v4.3.0
>       Merge branch 'release-v4.3.0' into 'master'
>       changelog: post-release
>       util: do not silently truncate
>       Merge branch 'slirp-fmt-truncate' into 'master'
>       Release v4.3.1
>       Merge branch 'release-v4.3.1' into 'master'
>
> Philippe Mathieu-Daudé (3):
>       Fix win32 builds by using the SLIRP_PACKED definition
>       Fix constness warnings
>       Remove unnecessary break
>
> Ralf Haferkamp (2):
>       Drop bogus IPv6 messages
>       Fix MTU check
>
> Samuel Thibault (1):
>       Merge branch 'ip6_payload_len' into 'master'
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  slirp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/slirp b/slirp
> index 2faae0f778f..a62d36734ff 160000
> --- a/slirp
> +++ b/slirp
> @@ -1 +1 @@
> -Subproject commit 2faae0f778f818fadc873308f983289df697eb93
> +Subproject commit a62d36734ffe9828d0f70df1b3898a3b4fbda755
> --
> 2.27.0.221.ga08a83db2b
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 3098 bytes --]

Re: [PATCH] slirp: update to v4.3.1

[Peter Maydell]

On Wed, 15 Jul 2020 at 19:12, Marc-André Lureau
<marcandre.lureau@gmail.com> wrote:
> On Mon, Jul 13, 2020 at 12:33 PM Marc-André Lureau <marcandre.lureau@redhat.com> wrote:
>>
>> Switch from stable-4.2 branch back to master (which is actually
>> maintained, I think we tend to forget about stable...).
>
>
> ping
>
> Peter, should I send a pull request directly?

Yes. I will not in general notice that I should be applying things
unless they are properly formed pull requests. I might notice a
patch I'm asked to apply directly, but it is pure luck.

> (I feel like it should be part of rc0, since it has a few new functionality/API...)

Sorry, you've missed that boat, I just pushed the tag ten minutes ago.

thanks
-- PMM

Re: [PATCH] slirp: update to v4.3.1

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 2118 bytes --]

Hi

On Mon, Jul 13, 2020 at 12:33 PM Marc-André Lureau <
marcandre.lureau@redhat.com> wrote:

> Switch from stable-4.2 branch back to master (which is actually
> maintained, I think we tend to forget about stable...).
>
> git shortlog 2faae0f7..a62d3673:
>
> 5eraph (2):
>       disable_dns option
>       limit vnameserver_addr to port 53
>
> Akihiro Suda (1):
>       libslirp.h: fix SlirpConfig v3 documentation
>
> Jindrich Novy (4):
>       Fix possible infinite loops and use-after-free
>       Use secure string copy to avoid overflow
>       Be sure to initialize sockaddr structure
>       Check lseek() for failure
>
> Marc-André Lureau (12):
>       Merge branch 'master' into 'master'
>       Merge branch 'fix-slirpconfig-3-doc' into 'master'
>       Fix use-afte-free in ip_reass() (CVE-2020-1983)
>       Update CHANGELOG
>       Merge branch 'cve-2020-1983' into 'master'
>       Release v4.3.0
>       Merge branch 'release-v4.3.0' into 'master'
>       changelog: post-release
>       util: do not silently truncate
>       Merge branch 'slirp-fmt-truncate' into 'master'
>       Release v4.3.1
>       Merge branch 'release-v4.3.1' into 'master'
>
> Philippe Mathieu-Daudé (3):
>       Fix win32 builds by using the SLIRP_PACKED definition
>       Fix constness warnings
>       Remove unnecessary break
>
> Ralf Haferkamp (2):
>       Drop bogus IPv6 messages
>       Fix MTU check
>
> Samuel Thibault (1):
>       Merge branch 'ip6_payload_len' into 'master'
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  slirp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/slirp b/slirp
> index 2faae0f778f..a62d36734ff 160000
> --- a/slirp
> +++ b/slirp
> @@ -1 +1 @@
> -Subproject commit 2faae0f778f818fadc873308f983289df697eb93
> +Subproject commit a62d36734ffe9828d0f70df1b3898a3b4fbda755
> --
> 2.27.0.221.ga08a83db2b
>
>
>
Anyone willing to ack this, or nack it and then someone (me?) will have to
backport the fixes in the slirp stable-4.2 branch.


-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2901 bytes --]