diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-30 09:24:22 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-30 09:24:22 -0500 |
| commit | d176dfce22f5ead7a6018edb69757bc8840cc008 (patch) | |
| tree | aa15398098e0f20a9fb643441ec8443b2ffd6328 /0001-virt-vbox-Fix-guest-capabilities-mask-check.patch | |
| parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
| download | kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.gz kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.xz kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.zip | |
kernel-5.8.0-0.rc3.20200630git7c30b859a947.1
* Tue Jun 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200630git7c30b859a947.1]
- 7c30b859a947 rebase
- Updated changelog for the release based on v5.8-rc3 (Fedora Kernel Team)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
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 1371a9555..77dbde8f5 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.25.4 +2.26.2 |