From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f177.google.com ([209.85.223.177]:35973 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757134AbcBDR6U (ORCPT ); Thu, 4 Feb 2016 12:58:20 -0500 Received: by mail-io0-f177.google.com with SMTP id g73so101654782ioe.3 for ; Thu, 04 Feb 2016 09:58:20 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1454526390-19792-16-git-send-email-zohar@linux.vnet.ibm.com> References: <1454526390-19792-1-git-send-email-zohar@linux.vnet.ibm.com> <1454526390-19792-16-git-send-email-zohar@linux.vnet.ibm.com> Date: Thu, 4 Feb 2016 09:58:19 -0800 Message-ID: Subject: Re: [PATCH v3 15/22] vfs: define kernel_copy_file_from_fd() From: Kees Cook To: Mimi Zohar Cc: linux-security-module , "Luis R. Rodriguez" , Kexec Mailing List , linux-modules@vger.kernel.org, David Howells , David Woodhouse , Dmitry Torokhov , Dmitry Kasatkin , Eric Biederman , Rusty Russell Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-modules@vger.kernel.org List-ID: On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar wrote: > This patch defines kernel_read_file_from_fd(), a wrapper for the VFS > common kernel_read_file(). > > Changelog: > - Separated from the kernel modules patch > > Signed-off-by: Mimi Zohar Acked-by: Kees Cook -Kees > --- > fs/exec.c | 16 ++++++++++++++++ > include/linux/fs.h | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/fs/exec.c b/fs/exec.c > index 1d39c4e..f3a0ce2 100644 > --- a/fs/exec.c > +++ b/fs/exec.c > @@ -910,6 +910,22 @@ int kernel_read_file_from_path(char *path, void **buf, loff_t *size, > } > EXPORT_SYMBOL_GPL(kernel_read_file_from_path); > > +int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size, > + enum kernel_read_file_id id) > +{ > + struct fd f = fdget(fd); > + int ret = -EBADF; > + > + if (!f.file) > + goto out; > + > + ret = kernel_read_file(f.file, buf, size, max_size, id); > +out: > + fdput(f); > + return ret; > +} > +EXPORT_SYMBOL_GPL(kernel_read_file_from_fd); > + > ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len) > { > ssize_t res = vfs_read(file, (void __user *)addr, len, &pos); > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 2a9670a..5ba806b 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2536,6 +2536,8 @@ extern int kernel_read_file(struct file *, void **, loff_t *, loff_t, > enum kernel_read_file_id); > extern int kernel_read_file_from_path(char *, void **, loff_t *, loff_t, > enum kernel_read_file_id); > +extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t, > + enum kernel_read_file_id); > extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t); > extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); > extern struct file * open_exec(const char *); > -- > 2.1.0 > -- Kees Cook Chrome OS & Brillo Security From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-io0-x234.google.com ([2607:f8b0:4001:c06::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aROAy-0007UQ-P1 for kexec@lists.infradead.org; Thu, 04 Feb 2016 17:58:41 +0000 Received: by mail-io0-x234.google.com with SMTP id 9so101913030iom.1 for ; Thu, 04 Feb 2016 09:58:20 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1454526390-19792-16-git-send-email-zohar@linux.vnet.ibm.com> References: <1454526390-19792-1-git-send-email-zohar@linux.vnet.ibm.com> <1454526390-19792-16-git-send-email-zohar@linux.vnet.ibm.com> Date: Thu, 4 Feb 2016 09:58:19 -0800 Message-ID: Subject: Re: [PATCH v3 15/22] vfs: define kernel_copy_file_from_fd() From: Kees Cook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Mimi Zohar Cc: Rusty Russell , Dmitry Kasatkin , "Luis R. Rodriguez" , Dmitry Torokhov , Kexec Mailing List , David Howells , linux-security-module , Eric Biederman , David Woodhouse , linux-modules@vger.kernel.org On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar wrote: > This patch defines kernel_read_file_from_fd(), a wrapper for the VFS > common kernel_read_file(). > > Changelog: > - Separated from the kernel modules patch > > Signed-off-by: Mimi Zohar Acked-by: Kees Cook -Kees > --- > fs/exec.c | 16 ++++++++++++++++ > include/linux/fs.h | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/fs/exec.c b/fs/exec.c > index 1d39c4e..f3a0ce2 100644 > --- a/fs/exec.c > +++ b/fs/exec.c > @@ -910,6 +910,22 @@ int kernel_read_file_from_path(char *path, void **buf, loff_t *size, > } > EXPORT_SYMBOL_GPL(kernel_read_file_from_path); > > +int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size, > + enum kernel_read_file_id id) > +{ > + struct fd f = fdget(fd); > + int ret = -EBADF; > + > + if (!f.file) > + goto out; > + > + ret = kernel_read_file(f.file, buf, size, max_size, id); > +out: > + fdput(f); > + return ret; > +} > +EXPORT_SYMBOL_GPL(kernel_read_file_from_fd); > + > ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len) > { > ssize_t res = vfs_read(file, (void __user *)addr, len, &pos); > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 2a9670a..5ba806b 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2536,6 +2536,8 @@ extern int kernel_read_file(struct file *, void **, loff_t *, loff_t, > enum kernel_read_file_id); > extern int kernel_read_file_from_path(char *, void **, loff_t *, loff_t, > enum kernel_read_file_id); > +extern int kernel_read_file_from_fd(int, void **, loff_t *, loff_t, > + enum kernel_read_file_id); > extern ssize_t kernel_write(struct file *, const char *, size_t, loff_t); > extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); > extern struct file * open_exec(const char *); > -- > 2.1.0 > -- Kees Cook Chrome OS & Brillo Security _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec