qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 6e157a: slirp: Add sanity check for str optio


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 6e157a: slirp: Add sanity check for str option length
Date: Tue, 23 Oct 2018 09:19:35 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6e157a0339793bb081705f52318fc77afd10addf
      
https://github.com/qemu/qemu/commit/6e157a0339793bb081705f52318fc77afd10addf
  Author: Fam Zheng <address@hidden>
  Date:   2018-10-21 (Sun, 21 Oct 2018)

  Changed paths:
    M net/slirp.c
    M slirp/bootp.c

  Log Message:
  -----------
  slirp: Add sanity check for str option length

When user provides a long domainname or hostname that doesn't fit in the
DHCP packet, we mustn't overflow the response packet buffer. Instead,
report errors, following the g_warning() in the slirp->vdnssearch
branch.

Also check the strlen against 256 when initializing slirp, which limit
is also from the protocol where one byte represents the string length.
This gives an early error before the warning which is harder to notice
or diagnose.

Reported-by: Thomas Huth <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Cc: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 0fca92b9077af9817c04545cdfc519fe95c6fde9
      
https://github.com/qemu/qemu/commit/0fca92b9077af9817c04545cdfc519fe95c6fde9
  Author: Fam Zheng <address@hidden>
  Date:   2018-10-21 (Sun, 21 Oct 2018)

  Changed paths:
    M net/slirp.c
    M qapi/net.json
    M qemu-options.hx
    M slirp/bootp.c
    M slirp/bootp.h
    M slirp/libslirp.h
    M slirp/slirp.c
    M slirp/slirp.h

  Log Message:
  -----------
  slirp: Implement RFC2132 TFTP server name

This new usernet option can be used to add data for option 66 (tftp
server name) in the BOOTP reply, which is useful in PXE based automatic
OS install such as OpenBSD.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 9b29b44e8ee55456e7df8106530534e1e6ef0d64
      
https://github.com/qemu/qemu/commit/9b29b44e8ee55456e7df8106530534e1e6ef0d64
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-23 (Tue, 23 Oct 2018)

  Changed paths:
    M net/slirp.c
    M qapi/net.json
    M qemu-options.hx
    M slirp/bootp.c
    M slirp/bootp.h
    M slirp/libslirp.h
    M slirp/slirp.c
    M slirp/slirp.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

Fam Zheng (2):
  slirp: Add sanity check for str option length
  slirp: Implement RFC2132 TFTP server name

# gpg: Signature made Sun 21 Oct 2018 20:29:34 BST
# gpg:                using RSA key E3F65A9E9560DB4C
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: 33FA 7B64 6195 01F8 CE9C  8F97 E3F6 5A9E 9560 DB4C

* remotes/thibault/tags/samuel-thibault:
  slirp: Implement RFC2132 TFTP server name
  slirp: Add sanity check for str option length

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/7acd80e82d93...9b29b44e8ee5
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]