[Qemu-commits] [qemu/qemu] d09a6f: migration: fix RCU deadlock

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d09a6fde1590ca3a45b608b6873a680f208dfeb5
      
https://github.com/qemu/qemu/commit/d09a6fde1590ca3a45b608b6873a680f208dfeb5
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: fix RCU deadlock

migration_end calls synchronize_rcu() within a critical section.
That causes a deadlock; move the call after rcu_read_unlock().

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


  Commit: 4f4f6976d80614e2d81cea4385885876f24bb257
      
https://github.com/qemu/qemu/commit/4f4f6976d80614e2d81cea4385885876f24bb257
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M crypto/cipher-builtin.c

  Log Message:
  -----------
  crypto: fix builtin qcrypto_cipher_free

This was dereferencing a pointer before checking if it was NULL.

Reported-by: Christian Borntraeger <address@hidden>
Reported-by: Aurelien Jarno <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a9dc4cf94c182f03c0061483891f53d1d21e5e68
      
https://github.com/qemu/qemu/commit/a9dc4cf94c182f03c0061483891f53d1d21e5e68
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M crypto/cipher-builtin.c
    M migration/ram.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Fixes for two bad bugs.  For 2.4-rc0.

# gpg: Signature made Thu Jul  9 15:54:19 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <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: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  crypto: fix builtin qcrypto_cipher_free
  migration: fix RCU deadlock

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


Compare: https://github.com/qemu/qemu/compare/032624868df2...a9dc4cf94c18