--- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ ifndef KERNEL KERNEL = /lib/modules/$(shell uname -r)/build endif -EXTRA_CFLAGS := -Wall -Wstrict-prototypes -O2 -fno-strict-aliasing +EXTRA_CFLAGS := -Wall -Wstrict-prototypes -O2 -fno-strict-aliasing -DHAVE_UNLOCKED_IOCTL obj-m += amifldrv_mod.o amifldrv_mod-objs := amifldrv.o amiwrap.o default: - make -C $(KERNEL) SUBDIRS=$(PWD) modules + make -C $(KERNEL) M=$(CURDIR) modules rm -f amifldrv.o_shipped mv amifldrv.o amifldrv.o_shipped rm -f amifldrv_mod.o --- a/amifldrv.c +++ b/amifldrv.c @@ -1,4 +1,5 @@ #include +#include #include #include #include "amifldrv.h" @@ -59,12 +60,13 @@ pvArg0 = (void*)&arg_kernel_space; pvArg1 = (void*)arg; ulArg0 = sizeof(AMIFLDRV_ALLOC); -wrap_copy_from_user(); -if (arg_kernel_space.size > 128*1024) return -EINVAL; +if (wrap_copy_from_user()) return -EFAULT; +if (arg_kernel_space.size <= 0 || arg_kernel_space.size > 128*1024) return -EINVAL; kmalloc_len = ((arg_kernel_space.size + PAGE_SIZE -1) & PAGE_MASK); ulArg0 = kmalloc_len+2*PAGE_SIZE; ulArg1 = GFP_DMA|GFP_KERNEL; kmalloc_ptr = wrap_kmalloc(); +if (!kmalloc_ptr) return -ENOMEM; kmalloc_area=(int *)(((unsigned long)kmalloc_ptr + PAGE_SIZE -1) & PAGE_MASK); for (virt_addr=(unsigned long)kmalloc_area; virt_addr<(unsigned long)kmalloc_area+kmalloc_len; virt_addr+=PAGE_SIZE) {ulArg0 = virt_addr; pvArg0 = wrap_virt_to_page(); wrap_mem_map_reserve();} @@ -80,7 +82,7 @@ pvArg0 = (void*)arg; pvArg1 = (void*)&arg_kernel_space; ulArg0 = sizeof(AMIFLDRV_ALLOC); -wrap_copy_to_user(); +if (wrap_copy_to_user()) return -EFAULT; return 0; } case CMD_FREE: @@ -91,7 +93,7 @@ pvArg0 = (void*)&arg_kernel_space; pvArg1 = (void*)arg; ulArg0 = sizeof(AMIFLDRV_ALLOC); -wrap_copy_from_user(); +if (wrap_copy_from_user()) return -EFAULT; if (kcount > 0) { for (isearch=0;isearchkmalloc_len){return(-ENXIO);} if ((offset+size)>kmalloc_len){return -ENXIO;} if ((vma->vm_flags & VM_WRITE) && !(vma->vm_flags & VM_SHARED)){return(-EINVAL);} -vma->vm_flags |= VM_LOCKED; +vm_flags_set(vma, VM_LOCKED); pvArg0 = vma; ulArg0 = vma->vm_start; ulArg1 = virt_to_phys((void*)((unsigned long)kmalloc_area));