Re: [PATCH RFC 1/2] PM / Hibernate: use name_to_dev_t to parse resume

[Sebastian Capella <sebastian.capella-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]

[-- Attachment #1.1: Type: text/plain, Size: 2092 bytes --]

Thanks Pavel!  I'll add the check for NULL.

name_to_dev_t expects a non-const name, but the buffer passed in is const.
I also am removing the '\n' if found at the end of the string which would
violate the const.

Thanks!

Sebastian


On 25 August 2013 08:38, Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org> wrote:

> Hi!
>
> > Use the name_to_dev_t call to parse the device name echo'd to
> > to /sys/power/resume.  This imitates the method used in hibernate.c
> > in software_resume, and allows the resume partition to be specified
> > using other equivalent device formats as well.  By allowing
> > /sys/debug/resume to accept the same syntax as the resume=device
> > parameter, we can parse the resume=device in the init script and
> > use the resume device directly from the kernel command line.
> >
> > Signed-off-by: Sebastian Capella <sebastian.capella-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> > ---
> >  kernel/power/hibernate.c |   14 +++++++++-----
> >  1 file changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> > index b26f5f1..51d4c29 100644
> > --- a/kernel/power/hibernate.c
> > +++ b/kernel/power/hibernate.c
> > @@ -971,15 +971,19 @@ static ssize_t resume_show(struct kobject *kobj,
> struct kobj_attribute *attr,
> >  static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute
> *attr,
> >                           const char *buf, size_t n)
> >  {
> > -     unsigned int maj, min;
> >       dev_t res;
> >       int ret = -EINVAL;
> > +     int len = n;
> > +     char *devcpy;
> >
> > -     if (sscanf(buf, "%u:%u", &maj, &min) != 2)
> > -             goto out;
> > +     if (buf[len-1] == '\n')
> > +             len--;
> > +
> > +     devcpy = kstrndup(buf, len, GFP_KERNEL);
> > +     res = name_to_dev_t(devcpy);
> > +     kfree(devcpy);
>
> Is the allocation actually neccessary? At the very least this should
> test for NULL...
>
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures)
> http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>

[-- Attachment #1.2: Type: text/html, Size: 3184 bytes --]

[-- Attachment #2: Type: text/plain, Size: 175 bytes --]

_______________________________________________
linaro-dev mailing list
linaro-dev-cunTk1MwBs8s++Sfvej+rw@public.gmane.org
http://lists.linaro.org/mailman/listinfo/linaro-dev