Use direct 64-bit conversion when computing shift

In mark_swap() and reset_signature() in suspend.c and in
open_resume_dev() and reset_signature() in resume.c the value of
shift is computed as a 32-bit value (on 32-bit systems), so use
direct type casting to make it 64-bit.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Jakob Lell <jakob@cs.tu-berlin.de>

2 files changed, 4 insertions, 4 deletions

diff --git a/resume.c b/resume.c
index 50ea2c8..bdb9e3a 100644
--- a/resume.c
+++ b/resume.c
@@ -172,7 +172,7 @@ static int open_resume_dev(char *resume_dev_name,
                            struct swsusp_header *swsusp_header)
 {
 	ssize_t size = sizeof(struct swsusp_header);
-	off64_t shift = (resume_offset + 1) * page_size - size;
+	off64_t shift = ((off64_t)resume_offset + 1) * page_size - size;
 	ssize_t ret;
 	int fd;
 
@@ -295,7 +295,7 @@ static int read_image(int dev, int fd, loff_t start)
 static int reset_signature(int fd, struct swsusp_header *swsusp_header)
 {
 	ssize_t ret, size = sizeof(struct swsusp_header);
-	off64_t shift = (resume_offset + 1) * page_size - size;
+	off64_t shift = ((off64_t)resume_offset + 1) * page_size - size;
 	int error = 0;
 
 	/* Reset swap signature now */
diff --git a/suspend.c b/suspend.c
index 51cab6f..bca96eb 100644
--- a/suspend.c
+++ b/suspend.c
@@ -1386,7 +1386,7 @@ static int mark_swap(int fd, loff_t start)
 {
 	int error = 0;
 	unsigned int size = sizeof(struct swsusp_header);
-	off64_t shift = (resume_offset + 1) * page_size - size;
+	off64_t shift = ((off64_t)resume_offset + 1) * page_size - size;
 
 	if (lseek64(fd, shift, SEEK_SET) != shift)
 		return -EIO;
@@ -1625,7 +1625,7 @@ static int reset_signature(int fd)
 {
 	int ret, error = 0;
 	unsigned int size = sizeof(struct swsusp_header);
-	off64_t shift = (resume_offset + 1) * page_size - size;
+	off64_t shift = ((off64_t)resume_offset + 1) * page_size - size;
 
 	if (lseek64(fd, shift, SEEK_SET) != shift)
 		return -EIO;