Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751639AbaBKR7H (ORCPT ); Tue, 11 Feb 2014 12:59:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21092 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751071AbaBKR7F (ORCPT ); Tue, 11 Feb 2014 12:59:05 -0500 Date: Tue, 11 Feb 2014 11:30:27 -0500 From: Richard Guy Briggs To: William Roberts Cc: linux-audit@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, sds@tycho.nsa.gov, William Roberts Subject: Re: [PATCH v5 2/3] proc: Update get proc_pid_cmdline() to use mm.h helpers Message-ID: <20140211163027.GL18807@madcap2.tricolour.ca> References: <1391710528-23481-1-git-send-email-wroberts@tresys.com> <1391710528-23481-2-git-send-email-wroberts@tresys.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1391710528-23481-2-git-send-email-wroberts@tresys.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/02/06, William Roberts wrote: > Re-factor proc_pid_cmdline() to use get_cmdline() helper > from mm.h. > > Acked-by: David Rientjes > Acked-by: Stephen Smalley Acked-by: Richard Guy Briggs > Signed-off-by: William Roberts > --- > fs/proc/base.c | 36 ++---------------------------------- > 1 file changed, 2 insertions(+), 34 deletions(-) > > diff --git a/fs/proc/base.c b/fs/proc/base.c > index 5150706..f0c5927 100644 > --- a/fs/proc/base.c > +++ b/fs/proc/base.c > @@ -200,41 +200,9 @@ static int proc_root_link(struct dentry *dentry, struct path *path) > return result; > } > > -static int proc_pid_cmdline(struct task_struct *task, char * buffer) > +static int proc_pid_cmdline(struct task_struct *task, char *buffer) > { > - int res = 0; > - unsigned int len; > - struct mm_struct *mm = get_task_mm(task); > - if (!mm) > - goto out; > - if (!mm->arg_end) > - goto out_mm; /* Shh! No looking before we're done */ > - > - len = mm->arg_end - mm->arg_start; > - > - if (len > PAGE_SIZE) > - len = PAGE_SIZE; > - > - res = access_process_vm(task, mm->arg_start, buffer, len, 0); > - > - // If the nul at the end of args has been overwritten, then > - // assume application is using setproctitle(3). > - if (res > 0 && buffer[res-1] != '\0' && len < PAGE_SIZE) { > - len = strnlen(buffer, res); > - if (len < res) { > - res = len; > - } else { > - len = mm->env_end - mm->env_start; > - if (len > PAGE_SIZE - res) > - len = PAGE_SIZE - res; > - res += access_process_vm(task, mm->env_start, buffer+res, len, 0); > - res = strnlen(buffer, res); > - } > - } > -out_mm: > - mmput(mm); > -out: > - return res; > + return get_cmdline(task, buffer, PAGE_SIZE); > } > > static int proc_pid_auxv(struct task_struct *task, char *buffer) > -- > 1.7.9.5 > - RGB -- Richard Guy Briggs Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/