From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Fabian Frederick <fabf@skynet.be>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] PM / hibernate: memory corruption in resumedelay_setup()
Date: Wed, 14 May 2014 16:08:46 +0000 [thread overview]
Message-ID: <20140514160845.GA5273@mwanda> (raw)
In-Reply-To: <20140514155602.GA9723@amd.pavel.ucw.cz>
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: 317cf7e5e85e ('PM / hibernate: convert simple_strtoul to kstrtoul')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: style differences
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 2377ff7..df88d55 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -35,7 +35,7 @@
static int nocompress;
static int noresume;
static int resume_wait;
-static int resume_delay;
+static unsigned int resume_delay;
static char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
@@ -1115,7 +1115,7 @@ static int __init resumewait_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)
return rc;
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Fabian Frederick <fabf@skynet.be>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch v2] PM / hibernate: memory corruption in resumedelay_setup()
Date: Wed, 14 May 2014 19:08:46 +0300 [thread overview]
Message-ID: <20140514160845.GA5273@mwanda> (raw)
In-Reply-To: <20140514155602.GA9723@amd.pavel.ucw.cz>
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: 317cf7e5e85e ('PM / hibernate: convert simple_strtoul to kstrtoul')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: style differences
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 2377ff7..df88d55 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -35,7 +35,7 @@
static int nocompress;
static int noresume;
static int resume_wait;
-static int resume_delay;
+static unsigned int resume_delay;
static char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
@@ -1115,7 +1115,7 @@ static int __init resumewait_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)
return rc;
next prev parent reply other threads:[~2014-05-14 16:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-14 12:57 [patch] PM / hibernate: memory corruption in resumedelay_setup() Dan Carpenter
2014-05-14 12:57 ` Dan Carpenter
2014-05-14 15:56 ` Pavel Machek
2014-05-14 15:56 ` Pavel Machek
2014-05-14 16:08 ` Dan Carpenter [this message]
2014-05-14 16:08 ` [patch v2] " Dan Carpenter
2014-05-14 20:29 ` Pavel Machek
2014-05-14 20:29 ` Pavel Machek
2014-05-19 23:23 ` Rafael J. Wysocki
2014-05-19 23:23 ` Rafael J. Wysocki
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=20140514160845.GA5273@mwanda \
--to=dan.carpenter@oracle.com \
--cc=fabf@skynet.be \
--cc=kernel-janitors@vger.kernel.org \
--cc=len.brown@intel.com \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
/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: link
Be 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.