From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756587AbZHZJhR (ORCPT ); Wed, 26 Aug 2009 05:37:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756460AbZHZJhQ (ORCPT ); Wed, 26 Aug 2009 05:37:16 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:36837 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756350AbZHZJhP (ORCPT ); Wed, 26 Aug 2009 05:37:15 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML Subject: [mmotm][PATCH 4/4] oom: fix oom_adjust_write() input sanity check Cc: kosaki.motohiro@jp.fujitsu.com, linux-mm , Andrew Morton , Paul Menage , David Rientjes , KAMEZAWA Hiroyuki , Oleg Nesterov In-Reply-To: <20090826182634.3968.A69D9226@jp.fujitsu.com> References: <20090826182634.3968.A69D9226@jp.fujitsu.com> Message-Id: <20090826183626.3974.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Wed, 26 Aug 2009 18:37:12 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrew Morton pointed out oom_adjust_write() has very strange EIO and new line handling. this patch fixes it. Cc: Paul Menage Cc: David Rientjes Cc: KAMEZAWA Hiroyuki Cc: Andrew Morton Signed-off-by: KOSAKI Motohiro --- fs/proc/base.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 0c1757c..ea71cae 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1022,21 +1022,24 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct task_struct *task; - char buffer[PROC_NUMBUF], *end; - int oom_adjust; + char buffer[PROC_NUMBUF]; + long oom_adjust; unsigned long flags; + int err; memset(buffer, 0, sizeof(buffer)); if (count > sizeof(buffer) - 1) count = sizeof(buffer) - 1; if (copy_from_user(buffer, buf, count)) return -EFAULT; - oom_adjust = simple_strtol(buffer, &end, 0); + + err = strict_strtol(strstrip(buffer), 0, &oom_adjust); + if (err) + return -EINVAL; if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) && oom_adjust != OOM_DISABLE) return -EINVAL; - if (*end == '\n') - end++; + task = get_proc_task(file->f_path.dentry->d_inode); if (!task) return -ESRCH; @@ -1055,9 +1058,8 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, unlock_task_sighand(task, &flags); put_task_struct(task); - if (end - buffer == 0) - return -EIO; - return end - buffer; + + return count; } static const struct file_operations proc_oom_adjust_operations = { -- 1.6.2.5