mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits) MAINTAINERS: linux-m32r is moderated for non-subscribers [email protected] is moderated for non-subscribers Drop default from "DM365 codec select" choice parisc: Kconfig: cleanup Kernel page size default Kconfig: remove redundant CONFIG_ prefix on two symbols cris: remove arch/cris/arch-v32/lib/nand_init.S microblaze: add missing CONFIG_ prefixes h8300: drop puzzling Kconfig dependencies MAINTAINERS: [email protected] is moderated for non-subscribers tty: drop superfluous dependency in Kconfig ARM: mxc: fix Kconfig typo 'i.MX51' Fix file references in Kconfig files aic7xxx: fix Kconfig references to READMEs Fix file references in drivers/ide/ thinkpad_acpi: Fix printk typo 'bluestooth' bcmring: drop commented out line in Kconfig btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888' doc: raw1394: Trivial typo fix CIFS: Don't free volume_info->UNC until we are entirely done with it. treewide: Correct spelling of successfully in comments ...
This commit is contained in:
commit
59e5253417
211 changed files with 293 additions and 578 deletions
|
|
@ -335,10 +335,9 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
|
|||
return -EINVAL;
|
||||
if (user_len > 65536)
|
||||
user_len = 65536;
|
||||
buf = vmalloc (user_len + 1); /* maybe better use the stack? */
|
||||
buf = vzalloc(user_len + 1); /* maybe better use the stack? */
|
||||
if (buf == NULL)
|
||||
return -ENOMEM;
|
||||
memset(buf, 0, user_len + 1);
|
||||
|
||||
if (strncpy_from_user (buf, user_buf, user_len) < 0) {
|
||||
rc = -EFAULT;
|
||||
|
|
|
|||
Loading…
Reference in a new issue