From: Tomas Racek <tracek@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: lczerner@redhat.com, Tomas Racek <tracek@redhat.com>,
Ben Myers <bpm@sgi.com> (supporter:XFS FILESYSTEM),
Alex Elder <elder@kernel.org> (supporter:XFS FILESYSTEM),
xfs@oss.sgi.com (supporter:XFS FILESYSTEM),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/1] xfs: check for possible overflow in xfs_ioc_trim
Date: Mon, 30 Jul 2012 10:13:44 +0200 [thread overview]
Message-ID: <1343636024-20123-1-git-send-email-tracek@redhat.com> (raw)
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@redhat.com>
---
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
next reply other threads:[~2012-07-30 8:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-30 8:13 Tomas Racek [this message]
2012-07-30 21:49 ` [PATCH 1/1] xfs: check for possible overflow in xfs_ioc_trim Dave Chinner
2012-07-31 10:32 ` Tomas Racek
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=1343636024-20123-1-git-send-email-tracek@redhat.com \
--to=tracek@redhat.com \
--cc=bpm@sgi.com \
--cc=elder@kernel.org \
--cc=lczerner@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox