2018-06-25 05:32:29

by Chengguang Xu

Subject: [PATCH] kernel/power: cast PAGE_SIZE to int when comparing with error code

If PAGE_SIZE is unsigned type then negative error code will be
larger than PAGE_SIZE.

Signed-off-by: Chengguang Xu <[email protected]>
---
kernel/power/swap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index c2bcf97d24c8..d7f6c1a288d3 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -923,7 +923,7 @@ int swsusp_write(unsigned int flags)
}
memset(&snapshot, 0, sizeof(struct snapshot_handle));
error = snapshot_read_next(&snapshot);
- if (error < PAGE_SIZE) {
+ if (error < (int)PAGE_SIZE) {
if (error >= 0)
error = -EFAULT;

@@ -1483,7 +1483,7 @@ int swsusp_read(unsigned int *flags_p)

memset(&snapshot, 0, sizeof(struct snapshot_handle));
error = snapshot_write_next(&snapshot);
- if (error < PAGE_SIZE)
+ if (error < (int)PAGE_SIZE)
return error < 0 ? error : -EFAULT;
header = (struct swsusp_info *)data_of(snapshot);
error = get_swap_reader(&handle, flags_p);
--
2.17.1

2018-07-02 01:17:56

by Chengguang Xu

Subject: Re: [PATCH] kernel/power: cast PAGE_SIZE to int when comparing with error code

Hi Rafael,

Could you have a look at this simple patch?

Thanks,
Chengguang


On 06/25/2018 01:30 PM, Chengguang Xu wrote:
> If PAGE_SIZE is unsigned type then negative error code will be
> larger than PAGE_SIZE.
>
> Signed-off-by: Chengguang Xu <[email protected]>
> ---
> kernel/power/swap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index c2bcf97d24c8..d7f6c1a288d3 100644
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -923,7 +923,7 @@ int swsusp_write(unsigned int flags)
> }
> memset(&snapshot, 0, sizeof(struct snapshot_handle));
> error = snapshot_read_next(&snapshot);
> - if (error < PAGE_SIZE) {
> + if (error < (int)PAGE_SIZE) {
> if (error >= 0)
> error = -EFAULT;
>
> @@ -1483,7 +1483,7 @@ int swsusp_read(unsigned int *flags_p)
>
> memset(&snapshot, 0, sizeof(struct snapshot_handle));
> error = snapshot_write_next(&snapshot);
> - if (error < PAGE_SIZE)
> + if (error < (int)PAGE_SIZE)
> return error < 0 ? error : -EFAULT;
> header = (struct swsusp_info *)data_of(snapshot);
> error = get_swap_reader(&handle, flags_p);

2018-07-02 07:15:24

by Rafael J. Wysocki

Subject: Re: [PATCH] kernel/power: cast PAGE_SIZE to int when comparing with error code

On Mon, Jul 2, 2018 at 3:10 AM, cgxu519 <[email protected]> wrote:
> Hi Rafael,
>
> Could you have a look at this simple patch?

I've done that already and I'm going to apply it.

Thanks,
Rafael


> On 06/25/2018 01:30 PM, Chengguang Xu wrote:
>>
>> If PAGE_SIZE is unsigned type then negative error code will be
>> larger than PAGE_SIZE.
>>
>> Signed-off-by: Chengguang Xu <[email protected]>
>> ---
>> kernel/power/swap.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
>> index c2bcf97d24c8..d7f6c1a288d3 100644
>> --- a/kernel/power/swap.c
>> +++ b/kernel/power/swap.c
>> @@ -923,7 +923,7 @@ int swsusp_write(unsigned int flags)
>> }
>> memset(&snapshot, 0, sizeof(struct snapshot_handle));
>> error = snapshot_read_next(&snapshot);
>> - if (error < PAGE_SIZE) {
>> + if (error < (int)PAGE_SIZE) {
>> if (error >= 0)
>> error = -EFAULT;
>> @@ -1483,7 +1483,7 @@ int swsusp_read(unsigned int *flags_p)
>> memset(&snapshot, 0, sizeof(struct snapshot_handle));
>> error = snapshot_write_next(&snapshot);
>> - if (error < PAGE_SIZE)
>> + if (error < (int)PAGE_SIZE)
>> return error < 0 ? error : -EFAULT;
>> header = (struct swsusp_info *)data_of(snapshot);
>> error = get_swap_reader(&handle, flags_p);
>
>

2018-07-04 10:52:58

by Rafael J. Wysocki

Subject: Re: [PATCH] kernel/power: cast PAGE_SIZE to int when comparing with error code

On Monday, July 2, 2018 9:14:03 AM CEST Rafael J. Wysocki wrote:
> On Mon, Jul 2, 2018 at 3:10 AM, cgxu519 <[email protected]> wrote:
> > Hi Rafael,
> >
> > Could you have a look at this simple patch?
>
> I've done that already and I'm going to apply it.

Applied now, thanks!