[Qemu-commits] [qemu/qemu] 624533: util/id: fully allocate names table

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 624533e5a53e5df347e46f06408d15b9df5254f0
      
https://github.com/qemu/qemu/commit/624533e5a53e5df347e46f06408d15b9df5254f0
  Author: John Snow <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M util/id.c

  Log Message:
  -----------
  util/id: fully allocate names table

Trivial: this array should be allocated to have ID_MAX entries always.
Otherwise if someone were to forget to expand this table, the assertion
in the id generator won't actually trigger; it will read junk data.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: e0df8f18f755d8c976db9bca2faabb763ad98ff2
      
https://github.com/qemu/qemu/commit/e0df8f18f755d8c976db9bca2faabb763ad98ff2
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M hw/bt/sdp.c

  Log Message:
  -----------
  bt: avoid unintended sign extension

In the case of a 4-byte length, shifting a value by 24 may cause
an unintended sign extension when converting from int to size_t.
Use a uint32_t variable instead.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 0ef74c7496fd3c526b2259f86326eca4b3a03b78
      
https://github.com/qemu/qemu/commit/0ef74c7496fd3c526b2259f86326eca4b3a03b78
  Author: Peter Maydell <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Diagnose broken linkers directly

Currently if the user's compiler works for creating .o files but
their linker is broken such that compiling an executable from a
C file does not work, we will report a misleading error message
about the compiler not supporting __thread (since that happens
to be the first test we run which requires a working linker).
Explicitly check that compile_prog works as well as compile_object,
so that people whose toolchain setup is broken get a more helpful
error message.

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


  Commit: 0e1d02452bf2c3486406dd48524a5b1de3c0eba8
      
https://github.com/qemu/qemu/commit/0e1d02452bf2c3486406dd48524a5b1de3c0eba8
  Author: Daniel P. Berrange <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M crypto/tlscreds.c
    M crypto/tlscredsx509.c

  Log Message:
  -----------
  crypto: avoid two coverity false positive error reports

In qcrypto_tls_creds_get_path() coverity complains that
we are checking '*creds' for NULL, despite having
dereferenced it previously. This is harmless bug due
to fact that the trace call was too early. Moving it
after the cleanup gets the desired semantics.

In qcrypto_tls_creds_check_cert_key_purpose() coverity
complains that we're passing a pointer to a previously
free'd buffer into gnutls_x509_crt_get_key_purpose_oid()
This is harmless because we're passing a size == 0, so
gnutls won't access the buffer, but rather just report
what size it needs to be. We can avoid it though by
explicitly setting the buffer to NULL after free'ing
it.

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: fccd35a04640a728f979e6d72b2c7d02c05549f0
      
https://github.com/qemu/qemu/commit/fccd35a04640a728f979e6d72b2c7d02c05549f0
  Author: Rodrigo Rebello <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: use appropriate code fragment for -fstack-protector checks

The check for stack-protector support consisted in compiling and linking
the test program below (output by function write_c_skeleton()) with the
compiler flag -fstack-protector-strong first and then with
-fstack-protector-all if the first one failed to work:

  int main(void) { return 0; }

This caused false positives when using certain toolchains in which the
compiler accepted -fstack-protector-strong but no support was provided
by the C library, since for this stack-protector variant the compiler
emits canary code only for functions that meet specific conditions
(local arrays, memory references to local variables, etc.) and the code
fragment under test included none of them (hence no stack protection
code generated, no link failure).

This fix changes the test program used for -fstack-protector checks to
include a function that meets conditions which cause the compiler to
generate canary code in all variants.

Signed-off-by: Rodrigo Rebello <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 63fc7375d6b0a083aef56950119af3d1d2a96e51
      
https://github.com/qemu/qemu/commit/63fc7375d6b0a083aef56950119af3d1d2a96e51
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M hw/mips/gt64xxx_pci.c

  Log Message:
  -----------
  gt64xxx: fix decoding of ISD register

The GT64xxx's internal registers can be placed above the first 4 GiB
in the address space, but not above the first 64 GiB.  Correctly cast
the register to a 64-bit integer, and mask away bits above bit 35.

Datasheet at 
http://pdf.datasheetarchive.com/datasheetsmain/Datasheets-33/DSA-655889.pdf
(bug reported by Coverity).

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 8ea9900330404eff0ea8812e2d96d1d5cbfb2c24
      
https://github.com/qemu/qemu/commit/8ea9900330404eff0ea8812e2d96d1d5cbfb2c24
  Author: Hervé Poussineau <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  scsi: remove scsi_req_free prototype

Function has been deleted in ad2d30f79d3b0812f02c741be2189796b788d6d7.

Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2988cbeaf94203b2cf31c0b3f589aa4ebc0cff34
      
https://github.com/qemu/qemu/commit/2988cbeaf94203b2cf31c0b3f589aa4ebc0cff34
  Author: Markus Armbruster <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M include/qemu/typedefs.h

  Log Message:
  -----------
  typedefs: Put them back into alphabetical order

"Please keep this list in alphabetical order" has been more honoured
in the breach than in the observance.  Clean up.

While there, drop a redundant struct declaration.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 98475746b357f6c048caf9e001998d8a0618b2e4
      
https://github.com/qemu/qemu/commit/98475746b357f6c048caf9e001998d8a0618b2e4
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M include/hw/bt.h

  Log Message:
  -----------
  bt: check struct sizes

See http://permalink.gmane.org/gmane.linux.bluez.kernel/36505.  For historical
reasons these do not use sizeof, and Coverity caught a mistake in
EVT_ENCRYPT_CHANGE_SIZE.

In addition:

- remove status from create_conn_cancel_cp; the "status" field is only
in rp structs.  Note that this means that the OCF_CREATE_CONN_CANCEL
could never have worked (it would have failed the LENGTH_CHECK), but
I am keeping it anyway.

- OCF_READ_LINK_QUALITY similarly could never have worked, but I am
fixing read_link_quality_cp anyway.

- fix inquiry_info which is shorter by one: the kernel has a struct that
is 14 byte long, but not counting the initial num_responses byte which
the kernel parses separately;

- remove extended_inquiry_info altogether, since it's not used and unlike
the other inquiry structs does not have the initial num_responses byte.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 61e3aa25b129b48d8a8cb851aae2a787af7ca5e1
      
https://github.com/qemu/qemu/commit/61e3aa25b129b48d8a8cb851aae2a787af7ca5e1
  Author: Peter Maydell <address@hidden>
  Date:   2015-12-04 (Fri, 04 Dec 2015)

  Changed paths:
    M configure
    M crypto/tlscreds.c
    M crypto/tlscredsx509.c
    M hw/bt/sdp.c
    M hw/mips/gt64xxx_pci.c
    M include/hw/bt.h
    M include/hw/scsi/scsi.h
    M include/qemu/typedefs.h
    M util/id.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/mjt/tags/pull-trivial-patches-2015-12-04' into staging

trivial patches for 2015-12-04

# gpg: Signature made Fri 04 Dec 2015 06:40:23 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"

* remotes/mjt/tags/pull-trivial-patches-2015-12-04:
  bt: check struct sizes
  typedefs: Put them back into alphabetical order
  scsi: remove scsi_req_free prototype
  gt64xxx: fix decoding of ISD register
  configure: use appropriate code fragment for -fstack-protector checks
  crypto: avoid two coverity false positive error reports
  configure: Diagnose broken linkers directly
  bt: avoid unintended sign extension
  util/id: fully allocate names table

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


Compare: https://github.com/qemu/qemu/compare/f33d046d2330...61e3aa25b129