mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
	akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk
Subject: [21/28] proc: do proper range check on readdir offset
Date: Tue, 19 Apr 2011 13:30:59 -0700	[thread overview]
Message-ID: <20110419204118.941779217@clark.kroah.org> (raw)
In-Reply-To: <20110419204122.GA13268@kroah.com>

2.6.32-longterm review patch.  If anyone has any objections, please let us know.

------------------

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

commit d8bdc59f215e62098bc5b4256fd9928bf27053a1 upstream.

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.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 fs/proc/base.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2806,11 +2806,16 @@ static int proc_pid_fill_cache(struct fi
 /* 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;
 



  parent reply	other threads:[~2011-04-19 20:45 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-19 20:41 [00/28] 2.6.32.39-longterm review Greg KH
2011-04-19 20:30 ` [01/28] cifs: always do is_path_accessible check in cifs_mount Greg KH
2011-04-19 20:30 ` [02/28] [media] video: sn9c102: world-wirtable sysfs files Greg KH
2011-04-19 20:30 ` [03/28] UBIFS: restrict world-writable debugfs files Greg KH
2011-04-19 20:30 ` [04/28] NET: cdc-phonet, handle empty phonet header Greg KH
2011-04-19 20:30 ` [05/28] x86: Fix a bogus unwind annotation in lib/semaphore_32.S Greg KH
2011-04-19 20:30 ` [06/28] [IA64] tioca: Fix assignment from incompatible pointer warnings Greg KH
2011-04-19 20:30 ` [07/28] [IA64] mca.c: Fix cast from integer to pointer warning Greg KH
2011-04-19 20:30 ` [08/28] ramfs: fix memleak on no-mmu arch Greg KH
2011-04-19 20:30 ` [09/28] MAINTAINERS: update STABLE BRANCH info Greg KH
2011-04-19 20:30 ` [10/28] UBIFS: fix oops when R/O file-system is fsynced Greg KH
2011-04-19 20:30 ` [11/28] x86, cpu: AMD errata checking framework Greg KH
2011-04-19 20:30 ` [12/28] x86, cpu: Clean up AMD erratum 400 workaround Greg KH
2011-04-20  1:40   ` [Stable-review] " Ben Hutchings
2011-04-20  2:01     ` Greg KH
2011-04-20  2:17       ` Ben Hutchings
2011-04-20  3:11         ` Greg KH
2011-04-20  4:48           ` Ben Hutchings
2011-04-20  5:06             ` Greg KH
2011-04-20  5:47               ` Willy Tarreau
2011-04-21  3:29               ` Ben Hutchings
2011-05-05 22:53                 ` Greg KH
2011-05-06  7:41                   ` Borislav Petkov
2011-05-10 12:58                     ` Ben Hutchings
2011-05-10 14:02                       ` Borislav Petkov
2011-05-10 15:13                         ` Greg KH
2011-05-10 15:38                           ` Borislav Petkov
2011-05-10  3:05                   ` Ben Hutchings
2011-04-19 20:30 ` [13/28] x86, AMD: Set ARAT feature on AMD processors Greg KH
2011-04-19 20:30 ` [14/28] x86, amd: Disable GartTlbWlkErr when BIOS forgets it Greg KH
2011-04-19 20:30 ` [15/28] USB: ftdi_sio: Added IDs for CTI USB Serial Devices Greg KH
2011-04-19 20:30 ` [16/28] USB: ftdi_sio: add PID for OCT DK201 docking station Greg KH
2011-04-19 20:30 ` [17/28] USB: ftdi_sio: add ids for Hameg HO720 and HO730 Greg KH
2011-04-19 20:30 ` [18/28] USB: option: Add new ONDA vendor id and product id for ONDA MT825UP Greg KH
2011-04-19 20:30 ` [19/28] USB: option: Added support for Samsung GT-B3730/GT-B3710 LTE USB modem Greg KH
2011-04-19 20:30 ` [20/28] next_pidmap: fix overflow condition Greg KH
2011-04-19 20:30 ` Greg KH [this message]
2011-04-19 20:31 ` [22/28] USB: EHCI: unlink unused QHs when the controller is stopped Greg KH
2011-04-19 20:31 ` [23/28] USB: fix formatting of SuperSpeed endpoints in /proc/bus/usb/devices Greg KH
2011-04-19 20:31 ` [24/28] USB: xhci - fix unsafe macro definitions Greg KH
2011-04-20  2:02   ` [Stable-review] " Ben Hutchings
2011-04-20  5:39     ` Willy Tarreau
2011-04-20 12:34       ` Ben Hutchings
2011-04-20 17:32         ` Sarah Sharp
2011-04-20 18:16           ` Dmitry Torokhov
2011-04-19 20:31 ` [25/28] USB: xhci - fix math in xhci_get_endpoint_interval() Greg KH
2011-04-19 20:31 ` [26/28] x86, cpu: Fix regression in AMD errata checking code Greg KH
2011-04-19 20:31 ` [27/28] net: ax25: fix information leak to userland harder Greg KH
2011-04-19 20:31 ` [28/28] net: fix rds_iovec page count overflow Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110419204118.941779217@clark.kroah.org \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable-review@kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®