Commit 819155f3 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] shmem: Copyright file_setup trivia

I _think_ shmem_file_setup is protected against negative loff_t size by the
TASK_SIZE in each arch, but prefer the security of an explicit test.  Wipe
those parentheses off its return(file), and update our Copyright.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ae801aa1
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* 2000-2001 Christoph Rohland * 2000-2001 Christoph Rohland
* 2000-2001 SAP AG * 2000-2001 SAP AG
* 2002 Red Hat Inc. * 2002 Red Hat Inc.
* Copyright (C) 2002-2003 Hugh Dickins. * Copyright (C) 2002-2004 Hugh Dickins.
* Copyright (C) 2002-2003 VERITAS Software Corporation. * Copyright (C) 2002-2004 VERITAS Software Corporation.
* Copyright (C) 2004 Andi Kleen, SuSE Labs * Copyright (C) 2004 Andi Kleen, SuSE Labs
* *
* This file is released under the GPL. * This file is released under the GPL.
...@@ -2099,7 +2099,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) ...@@ -2099,7 +2099,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
if (IS_ERR(shm_mnt)) if (IS_ERR(shm_mnt))
return (void *)shm_mnt; return (void *)shm_mnt;
if (size > SHMEM_MAX_BYTES) if (size < 0 || size > SHMEM_MAX_BYTES)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (shmem_acct_size(flags, size)) if (shmem_acct_size(flags, size))
...@@ -2133,7 +2133,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) ...@@ -2133,7 +2133,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
file->f_mapping = inode->i_mapping; file->f_mapping = inode->i_mapping;
file->f_op = &shmem_file_operations; file->f_op = &shmem_file_operations;
file->f_mode = FMODE_WRITE | FMODE_READ; file->f_mode = FMODE_WRITE | FMODE_READ;
return(file); return file;
close_file: close_file:
put_filp(file); put_filp(file);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment