diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-virt-vbox-Fix-guest-capabilities-mask-check.patch | |
parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
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 |