From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 9/8] xfs_io: fix integer over/underflow handling in timespec_from_string
Date: Tue, 28 Jan 2020 07:56:48 -0800 [thread overview]
Message-ID: <20200128155648.GN3447196@magnolia> (raw)
In-Reply-To: <157982499185.2765410.18206322669640988643.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
When we're filling out the struct timespec, make sure we detect when the
string value cannot be represented by a (potentially 32-bit) seconds
field in struct timespec.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxcmd/input.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/libxcmd/input.c b/libxcmd/input.c
index d232d4f3..137856e3 100644
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -183,19 +183,30 @@ timestr(
int
timespec_from_string(
- const char * secs,
- const char * nsecs,
- struct timespec * ts)
+ const char *secs,
+ const char *nsecs,
+ struct timespec *ts)
{
- char* p;
+ char *p;
+ unsigned long long int ll;
+
if (!secs || !nsecs || !ts)
return 1;
- ts->tv_sec = strtoull(secs, &p, 0);
+
+ ll = strtoull(secs, &p, 0);
if (*p)
return 1;
- ts->tv_nsec = strtoull(nsecs, &p, 0);
+ ts->tv_sec = ll;
+ if ((unsigned long long int)ts->tv_sec != ll)
+ return 1;
+
+ ll = strtoull(nsecs, &p, 0);
if (*p)
return 1;
+ ts->tv_nsec = ll;
+ if ((unsigned long long int)ts->tv_nsec != ll)
+ return 1;
+
return 0;
}
next prev parent reply other threads:[~2020-01-28 15:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 0:16 [PATCH 0/8] xfsprogs: random fixes Darrick J. Wong
2020-01-24 0:16 ` [PATCH 1/8] man: list xfs_io lsattr inode flag letters Darrick J. Wong
2020-01-25 23:16 ` Christoph Hellwig
2020-01-24 0:16 ` [PATCH 2/8] man: document the xfs_db btheight command Darrick J. Wong
2020-01-25 23:16 ` Christoph Hellwig
2020-01-24 0:16 ` [PATCH 3/8] man: reformat xfs_quota commands in the manpage for testing Darrick J. Wong
2020-01-25 23:16 ` Christoph Hellwig
2020-01-24 0:16 ` [PATCH 4/8] man: document some missing xfs_db commands Darrick J. Wong
2020-01-25 23:16 ` Christoph Hellwig
2020-01-24 0:17 ` [PATCH 5/8] xfs_db: dump per-AG reservations Darrick J. Wong
2020-01-25 23:17 ` Christoph Hellwig
2020-01-24 0:17 ` [PATCH 6/8] xfs_io: fix copy_file_range length argument overflow Darrick J. Wong
2020-01-25 23:18 ` Christoph Hellwig
2020-01-24 0:17 ` [PATCH 7/8] xfs_io: fix pwrite/pread length truncation on 32-bit systems Darrick J. Wong
2020-01-25 23:18 ` Christoph Hellwig
2020-01-24 0:17 ` [PATCH 8/8] xfs_repair: fix totally broken unit conversion in directory invalidation Darrick J. Wong
2020-01-25 23:19 ` Christoph Hellwig
2020-01-26 22:11 ` Darrick J. Wong
2020-01-30 18:35 ` Eric Sandeen
2020-01-28 15:56 ` Darrick J. Wong [this message]
2020-01-30 18:18 ` [PATCH 9/8] xfs_io: fix integer over/underflow handling in timespec_from_string Christoph Hellwig
2020-01-30 18:13 ` [PATCH 10/8] libxfs: remove duplicate attr function declarations Darrick J. Wong
2020-01-30 18:17 ` Christoph Hellwig
2020-01-30 18:28 ` Eric Sandeen
2020-01-30 18:40 ` Darrick J. Wong
2020-01-30 18:48 ` Eric Sandeen
2020-01-30 18:15 ` [PATCH 11/8] xfs_repair: don't corrupt a attr fork da3 node when clearing forw/back Darrick J. Wong
2020-01-30 18:22 ` Christoph Hellwig
2020-01-30 18:31 ` Darrick J. Wong
2020-01-30 18:46 ` [PATCH v2 " Darrick J. Wong
2020-01-31 6:03 ` Christoph Hellwig
2020-02-04 23:14 ` Darrick J. Wong
2020-02-05 6:07 ` Christoph Hellwig
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=20200128155648.GN3447196@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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