From 8df370d340a9c4aceb36662aeecd63d0c08b44c8 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 31 Oct 2015 19:21:14 +0000 Subject: swapon: fix stat(3) and open(3) race Signed-off-by: Sami Kerola --- sys-utils/swapon.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys-utils/swapon.c') diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 32a3107fd..c4d154420 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -475,7 +475,13 @@ static int swapon_checks(const char *special) unsigned long long devsize = 0; int permMask; - if (stat(special, &st) < 0) { + fd = open(special, O_RDONLY); + if (fd == -1) { + warn(_("cannot open %s"), special); + goto err; + } + + if (fstat(fd, &st) < 0) { warn(_("stat of %s failed"), special); goto err; } @@ -500,12 +506,6 @@ static int swapon_checks(const char *special) devsize = st.st_size; } - fd = open(special, O_RDONLY); - if (fd == -1) { - warn(_("cannot open %s"), special); - goto err; - } - if (S_ISBLK(st.st_mode) && blkdev_get_size(fd, &devsize)) { warnx(_("%s: get size failed"), special); goto err; -- cgit v1.2.3-55-g7522