diff options
| author | Augusto Caringi <acaringi@redhat.com> | 2020-06-29 15:02:20 -0300 |
|---|---|---|
| committer | Augusto Caringi <acaringi@redhat.com> | 2020-06-29 15:02:20 -0300 |
| commit | 9b53592daf7ec9906beefa9e36772dafcf446132 (patch) | |
| tree | ad225c0978d9a8ab32e649eb21b43492525b3c4e /0001-virt-vbox-Fix-guest-capabilities-mask-check.patch | |
| parent | a6d5bdfa755afd46b7cb294d2a32a4f53e79aef3 (diff) | |
| download | kernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.gz kernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.xz kernel-9b53592daf7ec9906beefa9e36772dafcf446132.zip | |
kernel-5.8.0-0.rc3.1
* Mon Jun 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.1]
- v5.8-rc3 rebase
- s390x-zfcpdump: Handle missing Module.symvers file (Don Zickus)
- Updated changelog for the release based on 8be3a53e18e0 (Fedora Kernel Team)
Resolves: rhbz#
Signed-off-by: Augusto Caringi <acaringi@redhat.com>
Diffstat (limited to '0001-virt-vbox-Fix-guest-capabilities-mask-check.patch')
| -rw-r--r-- | 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-virt-vbox-Fix-guest-capabilities-mask-check.patch b/0001-virt-vbox-Fix-guest-capabilities-mask-check.patch index 77dbde8f5..1371a9555 100644 --- a/0001-virt-vbox-Fix-guest-capabilities-mask-check.patch +++ b/0001-virt-vbox-Fix-guest-capabilities-mask-check.patch @@ -23,11 +23,11 @@ index 8fab04e76c14..18ebd7a6af98 100644 @@ -1444,7 +1444,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev, or_mask = caps->u.in.or_mask; not_mask = caps->u.in.not_mask; - + - if ((or_mask | not_mask) & ~VMMDEV_EVENT_VALID_EVENT_MASK) + if ((or_mask | not_mask) & ~VMMDEV_GUEST_CAPABILITIES_MASK) return -EINVAL; - + ret = vbg_set_session_capabilities(gdev, session, or_mask, not_mask, diff --git a/drivers/virt/vboxguest/vmmdev.h b/drivers/virt/vboxguest/vmmdev.h index 6337b8d75d96..21f408120e3f 100644 @@ -39,9 +39,9 @@ index 6337b8d75d96..21f408120e3f 100644 #define VMMDEV_GUEST_SUPPORTS_GRAPHICS BIT(2) +/* The mask of valid capabilities, for sanity checking. */ +#define VMMDEV_GUEST_CAPABILITIES_MASK 0x00000007U - + /** struct vmmdev_hypervisorinfo - Hypervisor info structure. */ struct vmmdev_hypervisorinfo { -- -2.26.2 +2.25.4 |