| To: | linux-xfs@xxxxxxxxxxxxxxx |
|---|---|
| Subject: | [PATCH 1/1] xfs: check for possible overflow in xfs_ioc_trim |
| From: | Tomas Racek <tracek@xxxxxxxxxx> |
| Date: | Mon, 30 Jul 2012 10:13:44 +0200 |
| Cc: | lczerner@xxxxxxxxxx, Tomas Racek <tracek@xxxxxxxxxx>, Ben Myers <bpm@xxxxxxx> (supporter:XFS FILESYSTEM), Alex Elder <elder@xxxxxxxxxx> (supporter:XFS FILESYSTEM), xfs@xxxxxxxxxxx (supporter:XFS FILESYSTEM), linux-kernel@xxxxxxxxxxxxxxx (open list) |
If range.start argument was between ULLONG_MAX - BBSIZE and ULLONG_MAX,
BTOBB macro resulted in overflow which caused start to be set to 0.
Now, invalid argument error is returned instead.
Signed-off-by: Tomas Racek <tracek@xxxxxxxxxx>
---
fs/xfs/xfs_discard.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index f9c3fe3..0ef7dd4 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -179,6 +179,10 @@ xfs_ioc_trim(
* used by the fstrim application. In the end it really doesn't
* matter as trimming blocks is an advisory interface.
*/
+
+ if (range.start > ULLONG_MAX - BBSIZE)
+ return -XFS_ERROR(EINVAL);
+
start = BTOBB(range.start);
end = start + BTOBBT(range.len) - 1;
minlen = BTOBB(max_t(u64, granularity, range.minlen));
--
1.7.7.6
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 7/8]fs/ocfs2: Evalue bio->bi_rw after calling bio_alloc() and before calling bio_add_page()., majianpeng |
|---|---|
| Next by Date: | [PATCH v2] xfstests: add btrfs snapshot function test, zhoubo |
| Previous by Thread: | [PATCH 7/8]fs/ocfs2: Evalue bio->bi_rw after calling bio_alloc() and before calling bio_add_page()., majianpeng |
| Next by Thread: | Re: [PATCH 1/1] xfs: check for possible overflow in xfs_ioc_trim, Dave Chinner |
| Indexes: | [Date] [Thread] [Top] [All Lists] |