p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PM / hibernate: Fix memory corruption in resumedelay_setup() 

In the original code "resume_delay" is an int so on 64 bits, the call to
kstrtoul() will cause memory corruption.  We may as well fix a style
issue here as well and make "resume_delay" unsigned int, since that's
what we pass to ssleep().

Fixes: 317cf7e5e8 (PM / hibernate: convert simple_strtoul to kstrtoul)
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Dan Carpenter 2014-05-14 19:08:46 +03:00 committed by Rafael J. Wysocki
parent 317cf7e5e8
commit f6514be5fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/power/hibernate.c
View File

@ -35,7 +35,7 @@
static int nocompress; static int nocompress;
static int noresume; static int noresume;
static int resume_wait; static int resume_wait;
static int resume_delay; static unsigned int resume_delay;
static char resume_file[256] = CONFIG_PM_STD_PARTITION; static char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device; dev_t swsusp_resume_device;
sector_t swsusp_resume_block; sector_t swsusp_resume_block;
@ -1115,7 +1115,7 @@ static int __init resumewait_setup(char *str)
static int __init resumedelay_setup(char *str) static int __init resumedelay_setup(char *str)
{ {
int rc = kstrtoul(str, 0, (unsigned long *)&resume_delay); int rc = kstrtouint(str, 0, &resume_delay);
if (rc) if (rc)
return rc; return rc;