Skip to contentSkip to conversation

block: pass inclusive 'lend' parameter to truncate_inode_pages_range

PATCH Applied Ming Lei 4 participants 4 messages Feb 10, 2018 – Feb 23, 2018

Subsystems (2)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH v2 1/1 block: pass inclusive 'lend' parameter to truncate_inode_pages_range

The 'lend' parameter of truncate_inode_pages_range is required to be inclusive, so follow the rule.

This patch fixes one memory corruption triggered by discard.

Cc Dmitry Monakhov <[email protected]>
Fixes 351499a172c0 ("block: Invalidate cache on discard v2")

---
V2:
- Cc stable list and Dmitry as suggested by Bart

 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/ioctl.c +1 -1
index 1668506d8ed8..3884d810efd2 100644
@@ -225,7 +225,7 @@ static int blk_ioctl_discard(struct block_device *bdev, fmode_t mode,
 
 	if (start + len > i_size_read(bdev->bd_inode))
 		return -EINVAL;
-	truncate_inode_pages_range(mapping, start, start + len);
+	truncate_inode_pages_range(mapping, start, start + len - 1);
 	return blkdev_issue_discard(bdev, start >> 9, len >> 9,
 				    GFP_KERNEL, flags);
 }
Signature · 1 line
2.9.5
#1 lore raw
Quoted 30 lines · Ming Lei

The 'lend' parameter of truncate_inode_pages_range is required to be inclusive, so follow the rule.

This patch fixes one memory corruption triggered by discard.

Cc Dmitry Monakhov <[email protected]>
Fixes 351499a172c0 ("block: Invalidate cache on discard v2")

---
V2:
- Cc stable list and Dmitry as suggested by Bart

 block/ioctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
block/ioctl.c +1 -2
index 1668506d8ed8..3884d810efd2 100644
@@ -225,7 +225,7 @@ static int blk_ioctl_discard(struct block_device *bdev, fmode_t mode,
 
        if (start + len > i_size_read(bdev->bd_inode))
                return -EINVAL;
-       truncate_inode_pages_range(mapping, start, start + len);
+       truncate_inode_pages_range(mapping, start, start + len - 1);
        return blkdev_issue_discard(bdev, start >> 9, len >> 9,
                                    GFP_KERNEL, flags);
 }
--
Quoted 2 lines

2.9.5

Hi Jens,

Could you consider it in v4.16 since it does fix a regression in lkp test?

Thanks,
Ming Lei

#2 lore raw
In reply to Ming Lei

T24gU2F0LCAyMDE4LTAyLTEwIGF0IDA4OjQ2ICswODAwLCBNaW5nIExlaSB3cm90ZToNCj4gVGhl ICdsZW5kJyBwYXJhbWV0ZXIgb2YgdHJ1bmNhdGVfaW5vZGVfcGFnZXNfcmFuZ2UgaXMgcmVxdWly ZWQgdG8gYmUNCj4gaW5jbHVzaXZlLCBzbyBmb2xsb3cgdGhlIHJ1bGUuDQo+IA0KPiBUaGlzIHBh dGNoIGZpeGVzIG9uZSBtZW1vcnkgY29ycnVwdGlvbiB0cmlnZ2VyZWQgYnkgZGlzY2FyZC4NCg0K UmV2aWV3ZWQtYnk6IEJhcnQgVmFuIEFzc2NoZSA8YmFydC52YW5hc3NjaGVAd2RjLmNvbT4NCg0K DQoNCg==

maintainer Applied
#3 lore raw
In reply to Ming Lei
Quoted 4 lines · Ming Lei

The 'lend' parameter of truncate_inode_pages_range is required to be inclusive, so follow the rule.

This patch fixes one memory corruption triggered by discard.

Applied, thanks.

Signature · 1 line
Jens Axboe