FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 05-18-2011, 10:12 PM
Brad Figg
 
Default proc: do proper range check on readdir offset, CVE-2011-1593

On 05/18/2011 02:16 PM, Herton Ronaldo Krzesinski wrote:

From: Linus Torvalds<torvalds@linux-foundation.org>

CVE-2011-1593

BugLink: https://bugs.launchpad.net/bugs/784727

Released until now with stable versions 2.6.27.59, 2.6.32.39, 2.6.33.12,
2.6.35.13, 2.6.38.4

Rather than pass in some random truncated offset to the pid-related
functions, check that the offset is in range up-front.

This is just cleanup, the previous commit fixed the real problem.

Cc: stable@kernel.org
Signed-off-by: Linus Torvalds<torvalds@linux-foundation.org>
(cherry-picked from commit d8bdc59f215e62098bc5b4256fd9928bf27053a1 upstream)
Signed-off-by: Herton Ronaldo Krzesinski<herton.krzesinski@canonical.com>
---
fs/proc/base.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1898c49..a91dc82 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2560,11 +2560,16 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
/* for the /proc/ directory itself, after non-process stuff has been done */
int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
{
- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
+ unsigned int nr;
+ struct task_struct *reaper;
struct tgid_iter iter;
struct pid_namespace *ns;

+ if (filp->f_pos>= PID_MAX_LIMIT + TGID_OFFSET)
+ goto out_no_task;
+ nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+
+ reaper = get_proc_task(filp->f_path.dentry->d_inode);
if (!reaper)
goto out_no_task;



Acked-by: Brad Figg <brad.figg@canonical.com>

--
Brad Figg brad.figg@canonical.com http://www.canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 
Old 05-19-2011, 12:19 AM
John Johansen
 
Default proc: do proper range check on readdir offset, CVE-2011-1593

On 05/18/2011 02:16 PM, Herton Ronaldo Krzesinski wrote:
> From: Linus Torvalds <torvalds@linux-foundation.org>
>
> CVE-2011-1593
>
> BugLink: https://bugs.launchpad.net/bugs/784727
>
> Released until now with stable versions 2.6.27.59, 2.6.32.39, 2.6.33.12,
> 2.6.35.13, 2.6.38.4
>
> Rather than pass in some random truncated offset to the pid-related
> functions, check that the offset is in range up-front.
>
> This is just cleanup, the previous commit fixed the real problem.
>
> Cc: stable@kernel.org
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> (cherry-picked from commit d8bdc59f215e62098bc5b4256fd9928bf27053a1 upstream)
> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

Acked-by: John Johansen <john.johansen@canonical.com>


> ---
> fs/proc/base.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index 1898c49..a91dc82 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -2560,11 +2560,16 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
> /* for the /proc/ directory itself, after non-process stuff has been done */
> int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
> {
> - unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
> - struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
> + unsigned int nr;
> + struct task_struct *reaper;
> struct tgid_iter iter;
> struct pid_namespace *ns;
>
> + if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET)
> + goto out_no_task;
> + nr = filp->f_pos - FIRST_PROCESS_ENTRY;
> +
> + reaper = get_proc_task(filp->f_path.dentry->d_inode);
> if (!reaper)
> goto out_no_task;
>


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 02:07 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org