From: Serge Hallyn <serge.hallyn@canonical.com> To: Aristeu Rozanski <aris@redhat.com> Cc: linux-kernel@vger.kernel.org, Dave Jones <davej@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>, Li Zefan <lizefan@huawei.com>, James Morris <jmorris@namei.org>, Pavel Emelyanov <xemul@openvz.org>, Jiri Slaby <jslaby@suse.cz>, cgroups@vger.kernel.org Subject: Re: [PATCH 3/4] device_cgroup: stop using simple_strtoul() Date: Mon, 22 Oct 2012 11:14:54 -0500 [thread overview] Message-ID: <20121022161454.GC23199@sergelap> (raw) In-Reply-To: <20121022134537.125748392@napanee.usersys.redhat.com> Quoting Aristeu Rozanski (aris@redhat.com): > This patch converts the code to use kstrtou32() instead of simple_strtoul() > which is deprecated. The real size of the variables are u32, so use kstrtou32 > instead of kstrtoul > > > Cc: Dave Jones <davej@redhat.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Tejun Heo <tj@kernel.org> > Cc: Li Zefan <lizefan@huawei.com> > Cc: James Morris <jmorris@namei.org> > Cc: Pavel Emelyanov <xemul@openvz.org> > Cc: Serge Hallyn <serge.hallyn@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> > Cc: Jiri Slaby <jslaby@suse.cz> > Signed-off-by: Aristeu Rozanski <aris@redhat.com> > > --- > security/device_cgroup.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > --- github.orig/security/device_cgroup.c 2012-10-19 16:35:46.366102913 -0400 > +++ github/security/device_cgroup.c 2012-10-19 16:35:50.801229331 -0400 > @@ -361,8 +361,8 @@ static int devcgroup_update_access(struc > int filetype, const char *buffer) > { > const char *b; > - char *endp; > - int count; > + char temp[12]; /* 11 + 1 characters needed for a u32 */ > + int count, rc; > struct dev_exception_item ex; > > if (!capable(CAP_SYS_ADMIN)) > @@ -405,8 +405,16 @@ return 0; > ex.major = ~0; > b++; > } else if (isdigit(*b)) { > - ex.major = simple_strtoul(b, &endp, 10); > - b = endp; > + memset(temp, 0, sizeof(temp)); > + for (count = 0; count < sizeof(temp) - 1; count++) { > + temp[count] = *b; > + b++; > + if (!isdigit(*b)) > + break; > + } > + rc = kstrtou32(temp, 10, &ex.major); > + if (rc) > + return -EINVAL; > } else { > return -EINVAL; > } > @@ -419,8 +427,16 @@ ex.major = simple_strtoul(b, &endp, 10 > ex.minor = ~0; > b++; > } else if (isdigit(*b)) { > - ex.minor = simple_strtoul(b, &endp, 10); > - b = endp; > + memset(temp, 0, sizeof(temp)); > + for (count = 0; count < sizeof(temp) - 1; count++) { > + temp[count] = *b; > + b++; > + if (!isdigit(*b)) > + break; > + } > + rc = kstrtou32(temp, 10, &ex.minor); > + if (rc) > + return -EINVAL; > } else { > return -EINVAL; > } >
WARNING: multiple messages have this Message-ID (diff)
From: Serge Hallyn <serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> To: Aristeu Rozanski <aris-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Dave Jones <davej-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>, Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>, James Morris <jmorris-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org>, Pavel Emelyanov <xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>, Jiri Slaby <jslaby-AlSwsSmVLrQ@public.gmane.org>, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCH 3/4] device_cgroup: stop using simple_strtoul() Date: Mon, 22 Oct 2012 11:14:54 -0500 [thread overview] Message-ID: <20121022161454.GC23199@sergelap> (raw) In-Reply-To: <20121022134537.125748392-cd6kKtb6gxi3M6m420IelR/sF2h8X+2i0E9HWUfgJXw@public.gmane.org> Quoting Aristeu Rozanski (aris-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org): > This patch converts the code to use kstrtou32() instead of simple_strtoul() > which is deprecated. The real size of the variables are u32, so use kstrtou32 > instead of kstrtoul > > > Cc: Dave Jones <davej-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Cc: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> > Cc: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > Cc: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> > Cc: James Morris <jmorris-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org> > Cc: Pavel Emelyanov <xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org> > Cc: Serge Hallyn <serge.hallyn-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> Acked-by: Serge E. Hallyn <serge.hallyn-GeWIH/nMZzLQT0dZR+AlfA@public.gmane.org> > Cc: Jiri Slaby <jslaby-AlSwsSmVLrQ@public.gmane.org> > Signed-off-by: Aristeu Rozanski <aris-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > > --- > security/device_cgroup.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > --- github.orig/security/device_cgroup.c 2012-10-19 16:35:46.366102913 -0400 > +++ github/security/device_cgroup.c 2012-10-19 16:35:50.801229331 -0400 > @@ -361,8 +361,8 @@ static int devcgroup_update_access(struc > int filetype, const char *buffer) > { > const char *b; > - char *endp; > - int count; > + char temp[12]; /* 11 + 1 characters needed for a u32 */ > + int count, rc; > struct dev_exception_item ex; > > if (!capable(CAP_SYS_ADMIN)) > @@ -405,8 +405,16 @@ return 0; > ex.major = ~0; > b++; > } else if (isdigit(*b)) { > - ex.major = simple_strtoul(b, &endp, 10); > - b = endp; > + memset(temp, 0, sizeof(temp)); > + for (count = 0; count < sizeof(temp) - 1; count++) { > + temp[count] = *b; > + b++; > + if (!isdigit(*b)) > + break; > + } > + rc = kstrtou32(temp, 10, &ex.major); > + if (rc) > + return -EINVAL; > } else { > return -EINVAL; > } > @@ -419,8 +427,16 @@ ex.major = simple_strtoul(b, &endp, 10 > ex.minor = ~0; > b++; > } else if (isdigit(*b)) { > - ex.minor = simple_strtoul(b, &endp, 10); > - b = endp; > + memset(temp, 0, sizeof(temp)); > + for (count = 0; count < sizeof(temp) - 1; count++) { > + temp[count] = *b; > + b++; > + if (!isdigit(*b)) > + break; > + } > + rc = kstrtou32(temp, 10, &ex.minor); > + if (rc) > + return -EINVAL; > } else { > return -EINVAL; > } >
next prev parent reply other threads:[~2012-10-22 16:15 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-10-22 13:45 [PATCH 0/4] Rebase device_cgroup v2 patchset Aristeu Rozanski 2012-10-22 13:45 ` [PATCH 1/4] cgroup: fix invalid rcu dereference Aristeu Rozanski 2012-10-22 16:11 ` Serge Hallyn 2012-10-22 16:11 ` Serge Hallyn 2012-10-23 12:50 ` Jiri Slaby 2012-10-23 12:50 ` Jiri Slaby 2012-10-23 13:17 ` Aristeu Rozanski 2012-10-23 13:17 ` Aristeu Rozanski 2012-10-23 13:53 ` Jiri Slaby 2012-10-23 13:53 ` Jiri Slaby 2012-10-22 13:45 ` [PATCH 2/4] device_cgroup: rename deny_all to behavior Aristeu Rozanski 2012-10-22 16:12 ` Serge Hallyn 2012-10-22 13:45 ` [PATCH 3/4] device_cgroup: stop using simple_strtoul() Aristeu Rozanski 2012-10-22 16:14 ` Serge Hallyn [this message] 2012-10-22 16:14 ` Serge Hallyn 2012-10-22 13:45 ` [PATCH 4/4] device_cgroup: add proper checking when changing default behavior Aristeu Rozanski 2012-10-22 16:16 ` Serge Hallyn 2012-10-22 16:16 ` Serge Hallyn 2012-10-22 19:58 ` [PATCH 0/4] Rebase device_cgroup v2 patchset Andrew Morton 2012-10-22 19:58 ` Andrew Morton 2012-10-22 20:14 ` Aristeu Rozanski 2012-10-22 20:14 ` Aristeu Rozanski 2013-05-14 15:05 ` Serge Hallyn 2013-05-14 15:51 ` Aristeu Rozanski 2013-05-14 15:51 ` Aristeu Rozanski 2013-05-14 16:22 ` Serge Hallyn 2013-05-14 16:22 ` Serge Hallyn 2013-05-14 21:02 ` Eric W. Biederman 2013-05-14 21:02 ` Eric W. Biederman 2013-05-16 1:14 ` Serge E. Hallyn 2013-05-16 1:14 ` Serge E. Hallyn 2013-05-16 1:23 ` Serge E. Hallyn 2013-05-16 1:23 ` Serge E. Hallyn
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=20121022161454.GC23199@sergelap \ --to=serge.hallyn@canonical.com \ --cc=akpm@linux-foundation.org \ --cc=aris@redhat.com \ --cc=cgroups@vger.kernel.org \ --cc=davej@redhat.com \ --cc=jmorris@namei.org \ --cc=jslaby@suse.cz \ --cc=linux-kernel@vger.kernel.org \ --cc=lizefan@huawei.com \ --cc=tj@kernel.org \ --cc=xemul@openvz.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.