Attachment #48020 for bug #77094

Lines 339-345 Link Here

(-)linux-2.6.10/drivers/block/scsi_ioctl.c (-1 / +2 lines)
339	struct gendisk bd_disk, Scsi_Ioctl_Command __user sic)	339	struct gendisk bd_disk, Scsi_Ioctl_Command __user sic)
340	{	340	{
341	struct request *rq;	341	struct request *rq;
342	int err, in_len, out_len, bytes, opcode, cmdlen;	342	unsigned int bytes, opcode, cmdlen, in_len, out_len;
		343	int err;
343	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];	344	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
344		345
345	/*	346	/*

Lines 807-812 Link Here

(-)linux-2.6.10/drivers/char/moxa.c (+2 lines)
807	case TIOCSSERIAL:	807	case TIOCSSERIAL:
808	return moxa_set_serial_info(ch, argp);	808	return moxa_set_serial_info(ch, argp);
809	default:	809	default:
		810	if(!capable(CAP_SYS_RAWIO))
		811	return -EPERM;
810	retval = MoxaDriverIoctl(cmd, arg, port);	812	retval = MoxaDriverIoctl(cmd, arg, port);
811	}	813	}
812	return (retval);	814	return (retval);

Lines 1360-1365 Link Here

(-)linux-2.6.10/mm/mmap.c (+15 lines)
1360	vm_unacct_memory(grow);	1360	vm_unacct_memory(grow);
1361	return -ENOMEM;	1361	return -ENOMEM;
1362	}	1362	}
		1363	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
		1364	((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
		1365	current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
		1366	anon_vma_unlock(vma);
		1367	vm_unacct_memory(grow);
		1368	return -ENOMEM;
		1369	}
1363	vma->vm_end = address;	1370	vma->vm_end = address;
1364	vma->vm_mm->total_vm += grow;	1371	vma->vm_mm->total_vm += grow;
1365	if (vma->vm_flags & VM_LOCKED)	1372	if (vma->vm_flags & VM_LOCKED)
Lines 1422-1427 Link Here
1422	vm_unacct_memory(grow);	1429	vm_unacct_memory(grow);
1423	return -ENOMEM;	1430	return -ENOMEM;
1424	}	1431	}
		1432	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
		1433	((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
		1434	current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
		1435	anon_vma_unlock(vma);
		1436	vm_unacct_memory(grow);
		1437	return -ENOMEM;
		1438	}
1425	vma->vm_start = address;	1439	vma->vm_start = address;
1426	vma->vm_pgoff -= grow;	1440	vma->vm_pgoff -= grow;
1427	vma->vm_mm->total_vm += grow;	1441	vma->vm_mm->total_vm += grow;
Lines 1833-1838 Link Here
1833	down_write(&current->mm->mmap_sem);	1847	down_write(&current->mm->mmap_sem);
1834	ret = __do_brk(addr, len);	1848	ret = __do_brk(addr, len);
1835	up_write(&current->mm->mmap_sem);	1849	up_write(&current->mm->mmap_sem);
		1850	return ret;
1836	}	1851	}
1837		1852
1838	EXPORT_SYMBOL(do_brk);	1853	EXPORT_SYMBOL(do_brk);

Lines 1906-1912 Link Here

(-)linux.vanilla-2.6.10/drivers/char/random.c (-1 / +1 lines)
1906	void __user oldval, size_t __user oldlenp,	1906	void __user oldval, size_t __user oldlenp,
1907	void __user newval, size_t newlen, void *context)	1907	void __user newval, size_t newlen, void *context)
1908	{	1908	{
1909	int len;	1909	unsigned int len;
1910		1910
1911	sysctl_poolsize = random_state->poolinfo.POOLBYTES;	1911	sysctl_poolsize = random_state->poolinfo.POOLBYTES;
1912		1912

Return to bug 77094