Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -urN a/vmnet-only/Makefile b/vmnet-only/Makefile
- --- a/vmnet-only/Makefile 2019-03-23 13:44:04.625219877 +0100
- +++ b/vmnet-only/Makefile 2019-03-23 13:51:37.186069807 +0100
- @@ -107,7 +107,7 @@
- postbuild:: ;
- $(DRIVER_KO): prebuild
- - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- + $(MAKE) -C $(BUILD_DIR) M=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) modules
- $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
- MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
- diff -urN a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
- --- a/vmnet-only/Makefile.kernel 2019-03-23 13:44:04.625219877 +0100
- +++ b/vmnet-only/Makefile.kernel 2019-03-23 13:51:37.186069807 +0100
- @@ -32,6 +32,6 @@
- ####
- clean:
- - rm -rf $(DRIVER).o $(DRIVER).mod.o $(DRIVER).mod.c $(DRIVER).ko \
- + rm -rf $(DRIVER).o $(DRIVER).mod.o $(DRIVER).mod.c $(DRIVER).ko .cache.mk \
- .tmp_versions Module.symvers Modules.symvers Module.markers \
- modules.order $($(DRIVER)-y) .*.cmd .*.o.flags
- diff -urN a/vmnet-only/userif.c b/vmnet-only/userif.c
- --- a/vmnet-only/userif.c 2019-03-23 13:44:04.625219877 +0100
- +++ b/vmnet-only/userif.c 2019-03-23 13:51:37.186069807 +0100
- @@ -85,6 +85,12 @@
- # define compat_kunmap(page) kunmap((page).p)
- #endif
- +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && defined(VERIFY_WRITE)
- + #define write_access_ok(addr, size) access_ok(VERIFY_WRITE, addr, size)
- +#else
- + #define write_access_ok(addr, size) access_ok(addr, size)
- +#endif
- +
- /*
- *-----------------------------------------------------------------------------
- *
- @@ -142,7 +148,7 @@
- struct page **p, // OUT: locked page
- void **ptr) // OUT: kernel mapped pointer
- {
- - if (!access_ok(VERIFY_WRITE, (void *)uAddr, size) ||
- + if (!write_access_ok((void *)uAddr, size) ||
- (((uAddr + size - 1) & ~(PAGE_SIZE - 1)) !=
- (uAddr & ~(PAGE_SIZE - 1)))) {
- return -EINVAL;
- diff -urN a/vmnet-only/vm_device_version.h b/vmnet-only/vm_device_version.h
- --- a/vmnet-only/vm_device_version.h 2019-03-23 13:44:04.625219877 +0100
- +++ b/vmnet-only/vm_device_version.h 2019-03-23 13:51:37.189403122 +0100
- @@ -35,6 +35,8 @@
- #endif
- #endif
- +#include <linux/pci_ids.h>
- +
- /* LSILogic 53C1030 Parallel SCSI controller
- * LSILogic SAS1068 SAS controller
- */
- @@ -53,7 +55,10 @@
- * VMware HD Audio codec
- * VMware HD Audio controller
- */
- +#ifndef PCI_VENDOR_ID_VMWARE
- #define PCI_VENDOR_ID_VMWARE 0x15AD
- +#endif
- +
- #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
- #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
- #define PCI_DEVICE_ID_VMWARE_VGA 0x0711
- @@ -70,7 +75,11 @@
- #define PCI_DEVICE_ID_VMWARE_1394 0x0780
- #define PCI_DEVICE_ID_VMWARE_BRIDGE 0x0790
- #define PCI_DEVICE_ID_VMWARE_ROOTPORT 0x07A0
- +
- +#ifndef PCI_DEVICE_ID_VMWARE_VMXNET3
- #define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0
- +#endif
- +
- #define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0
- #define PCI_DEVICE_ID_VMWARE_82574 0x07D0
- #define PCI_DEVICE_ID_VMWARE_AHCI 0x07E0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement