commit 22a5b566c8c442b0b35b3b106795e2f2b3578096 Merge: 114279b 3b24f09 Author: Linus Torvalds Date: Tue Nov 30 17:57:57 2010 -0800 Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91 * 'for_linus' of git://github.com/at91linux/linux-2.6-at91: at91/board-yl-9200: fix typo in video support atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer' at91/picotux200: remove commenting usb device and dataflash support at91: rename rm9200ek and rm9200dk board file name at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used at91: Convert remaining boards to new-style UART initialization at91: merge all at91rm9200 defconfig in one single file commit 114279be2120a916e8a04feeb2ac976a10016f2f Author: Oleg Nesterov Date: Tue Nov 30 20:56:02 2010 +0100 exec: copy-and-paste the fixes into compat_do_execve() paths Note: this patch targets 2.6.37 and tries to be as simple as possible. That is why it adds more copy-and-paste horror into fs/compat.c and uglifies fs/exec.c, this will be cleanuped later. compat_copy_strings() plays with bprm->vma/mm directly and thus has two problems: it lacks the RLIMIT_STACK check and argv/envp memory is not visible to oom killer. Export acct_arg_size() and get_arg_page(), change compat_copy_strings() to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0) as do_execve() does. Add the fatal_signal_pending/cond_resched checks into compat_count() and compat_copy_strings(), this matches the code in fs/exec.c and certainly makes sense. Signed-off-by: Oleg Nesterov Cc: KOSAKI Motohiro Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 3c77f845722158206a7209c45ccddc264d19319c Author: Oleg Nesterov Date: Tue Nov 30 20:55:34 2010 +0100 exec: make argv/envp memory visible to oom-killer Brad Spengler published a local memory-allocation DoS that evades the OOM-killer (though not the virtual memory RLIMIT): http://www.grsecurity.net/~spender/64bit_dos.c execve()->copy_strings() can allocate a lot of memory, but this is not visible to oom-killer, nobody can see the nascent bprm->mm and take it into account. With this patch get_arg_page() increments current's MM_ANONPAGES counter every time we allocate the new page for argv/envp. When do_execve() succeds or fails, we change this counter back. Technically this is not 100% correct, we can't know if the new page is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but I don't think this really matters and everything becomes correct once exec changes ->mm or fails. Reported-by: Brad Spengler Reviewed-and-discussed-by: KOSAKI Motohiro Signed-off-by: Oleg Nesterov Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 37a09f07459753e7c98d4e21f1c61e8756923f81 Author: Trond Myklebust Date: Tue Nov 30 12:42:34 2010 -0500 NFS: Fix a readdirplus bug When comparing filehandles in the helper nfs_same_file(), we should not be using 'strncmp()': filehandles are not null terminated strings. Instead, we should just use the existing helper nfs_compare_fh(). Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 3b24f0950bc55ca604a9f0da3ca894f9315cb573 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Sun Nov 21 11:24:07 2010 +0800 at91/board-yl-9200: fix typo in video support for the epson frambuffer support it's CONFIG_FB_S1D13XXX not CONFIG_FB_S1D135XX Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Nicolas Ferre commit 214b574ab81236e7740243985d63a1d6a61231a2 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Sat Nov 20 14:52:53 2010 +0800 atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer' passing argument 2 of 'dma_map_single' discards qualifiers from pointer target type Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Nicolas Ferre commit 82d5b5c8da769184a9bc2cc2adc90555f4aa90b0 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Sun Nov 21 10:31:19 2010 +0800 at91/picotux200: remove commenting usb device and dataflash support as based on http://www.picotux.com/pt200/picotux200.pdf these board does not have such I/O Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Nicolas Ferre commit 985f554d8f0c2cf5bda5720921cb48654420d6b1 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Fri Nov 19 22:34:38 2010 +0800 at91: rename rm9200ek and rm9200dk board file name to be a few more concistant with the other boards as ek is for evaluation kit and dk for development kit Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Andrew Victor commit 55d83b0a6eb61d159a4a6d269745ee019f9f5f91 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Fri Nov 19 22:31:35 2010 +0800 at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Andrew Victor commit 8e79d2d4e7147eb6dfd075d7cb200c666566a9e0 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Fri Nov 19 22:31:03 2010 +0800 at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Andrew Victor commit 8ae8cd978bc773e916e0b51a76fe3f096fa31069 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Fri Nov 19 22:23:28 2010 +0800 at91: Convert remaining boards to new-style UART initialization Convert the following AT91RM9200-based boards to the new-style UART initialization: - Ajeco 1ARM Single Board Computer - Sperry-Sun KAFA board - picotux 200 Remove the deprecated at91_init_serial Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Andrew Victor commit b94ca0792d49f5856570ba66f53acd69cd0917fc Author: Eric Benard Date: Fri Oct 15 11:27:17 2010 +0200 at91: merge all at91rm9200 defconfig in one single file About all options present in each file are activated in the single file. Signed-off-by: Eric Benard Tested-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Nicolas Ferre