* [PATCH 1/2] xfstests: update 'new' script v3
@ 2014-10-23 11:08 Dmitry Monakhov
2014-10-23 11:08 ` [PATCH 2/2] add aio/dio regression test race between write and fcntl V5 Dmitry Monakhov
2014-11-10 1:58 ` [PATCH 1/2] xfstests: update 'new' script v3 Dave Chinner
0 siblings, 2 replies; 3+ messages in thread
From: Dmitry Monakhov @ 2014-10-23 11:08 UTC (permalink / raw)
To: fstests; +Cc: linux-ext4, root
From: root <root@ts105.qa.sw.ru>
- Update script to support new test cheme tests/$fs_type/$TEST_IDX
- Try to use first unused ID
changes from v2
- gawk->$AWK_PROG
Reviewed-by: Eryu Guan <eguan@redhat.com>
---
new | 85 ++++++++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/new b/new
index f3e6fa1..86f9075 100755
--- a/new
+++ b/new
@@ -32,10 +32,22 @@ _cleanup()
:
}
-if [ ! -f group ]
+SRC_GROUPS=`find tests -not -path tests -type d -printf "%f "`
+usage()
+{
+ echo "Usage $0 test_dir"
+ echo "Available dirs are: $SRC_GROUPS"
+ exit
+}
+
+[ $# -eq 0 ] && usage
+tdir=tests/$1
+shift
+
+if [ ! -f $tdir/group ]
then
- echo "Creating the group index ..."
- cat <<'End-of-File' >group
+ echo "Creating the $tdir/group index ..."
+ cat <<'End-of-File' >$tdir/group
# QA groups control
#
# define groups and default group owners
@@ -51,10 +63,10 @@ other some-user-login
End-of-File
fi
-if [ ! -w group ]
+if [ ! -w $tdir/group ]
then
- chmod u+w group
- echo "Warning: making the index file \"group\" writeable"
+ chmod u+w $tdir/group
+ echo "Warning: making the index file \"$tdir/group\" writeable"
fi
if make
@@ -64,13 +76,33 @@ else
echo "Warning: make failed -- some tests may be missing"
fi
-last=`grep '^[0-9][0-9]* ' group | sort | tail -1 | sed -e 's/[ ].*//'`
-# get rid of leading 0s as can be interpreted as octal
-last=`echo $last | sed 's/^0*//'`
-id=`$AWK_PROG </dev/null 'BEGIN{printf "%03d\n",'$last'+1}'`
+i=0
+line=0
+eof=1
+[ -f "$tdir/group" ] || usage
+
+for found in `cat $tdir/group | $AWK_PROG '{ print $1 }'`
+do
+ line=$((line+1))
+ if [ -z "$found" ] || [ "$found" == "#" ];then
+ continue
+ fi
+ i=$((i+1))
+ id=`printf "%03d" $i`
+ if [ "$id" != "$found" ];then
+ eof=0
+ break
+ fi
+done
+if [ $eof -eq 1 ]; then
+ line=$((line+1))
+ i=$((i+1))
+ id=`printf "%03d" $i`
+fi
+
echo "Next test is $id"
-if [ -f $id ]
+if [ -f $tdir/$id ]
then
echo "Error: test $id already exists!"
_cleanup
@@ -81,7 +113,7 @@ echo -n "Creating skeletal script for you to edit ..."
year=`date +%Y`
-cat <<End-of-File >$id
+cat <<End-of-File >$tdir/$id
#! /bin/bash
# FS QA Test No. $id
#
@@ -146,11 +178,12 @@ End-of-File
sleep 2 # latency to read messages to this point
echo ""
-chmod 755 $id
-${EDITOR-vi} $id
+chmod 755 $tdir/$id
+${EDITOR-vi} $tdir/$id
if [ $# -eq 0 ]
then
+
while true
do
echo -n "Add to group(s) [other] (? for list): "
@@ -158,12 +191,15 @@ then
[ -z "$ans" ] && ans=other
if [ "X$ans" = "X?" ]
then
- $AWK_PROG <group '
-BEGIN { text = "# ???" }
-/^[a-z]/ { printf "%-16.16s %s\n",$1,text; text = "# ???"; next }
-NF < 2 { next }
- { text = $0 }' \
- | sort
+ for d in $SRC_GROUPS; do
+ l=$(sed -n < tests/$d/group \
+ -e 's/#.*//' \
+ -e 's/$/ /' \
+ -e 's;\(^[0-9][0-9][0-9]\)\(.*$\);\2;p')
+ grpl="$grpl $l"
+ done
+ lst=`for word in $grpl; do echo $word; done | sort| uniq `
+ echo $lst
else
break
fi
@@ -173,18 +209,21 @@ else
#
for g in $*
do
- if grep "^$g[ ]" group >/dev/null
+ if grep "^$g[ ]" $tdir/group >/dev/null
then
:
else
- echo "Warning: group \"$g\" not defined in ./group"
+ echo "Warning: group \"$g\" not defined in $tdir/group"
fi
done
ans="$*"
fi
echo -n "Adding $id to group index ..."
-echo "$id $ans" >>group
+head -n $(($line-1)) $tdir/group > /tmp/$$.group
+echo "$id $ans" >> /tmp/$$.group
+tail -n +$((line)) $tdir/group >> /tmp/$$.group
+mv /tmp/$$.group $tdir/group
echo " done."
exit 0
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] add aio/dio regression test race between write and fcntl V5
2014-10-23 11:08 [PATCH 1/2] xfstests: update 'new' script v3 Dmitry Monakhov
@ 2014-10-23 11:08 ` Dmitry Monakhov
2014-11-10 1:58 ` [PATCH 1/2] xfstests: update 'new' script v3 Dave Chinner
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Monakhov @ 2014-10-23 11:08 UTC (permalink / raw)
To: fstests; +Cc: linux-ext4, root
From: root <root@ts105.qa.sw.ru>
Original report: https://lkml.org/lkml/2014/10/8/545
perform AIO-DIO and fcntl(F_SETFL) concurently
Unaligned AIO likely result in synchronization which makes racewindow wider.
changes from v4
fix incorrect timer initialization
changes from v3
rebase to current xfstests HEAD
changes from v2->v3
- Copyright fixes according to Dave's comments
changes from v1->v2
- Properly reuse aio context
Reviewed-by: Eryu Guan <eguan@redhat.com>
---
src/aio-dio-regress/aio-dio-fcntl-race.c | 150 ++++++++++++++++++++++++++++++
tests/generic/036 | 51 ++++++++++
tests/generic/036.out | 2 +
tests/generic/group | 1 +
4 files changed, 204 insertions(+), 0 deletions(-)
create mode 100644 src/aio-dio-regress/aio-dio-fcntl-race.c
create mode 100755 tests/generic/036
create mode 100644 tests/generic/036.out
diff --git a/src/aio-dio-regress/aio-dio-fcntl-race.c b/src/aio-dio-regress/aio-dio-fcntl-race.c
new file mode 100644
index 0000000..cdf9773
--- /dev/null
+++ b/src/aio-dio-regress/aio-dio-fcntl-race.c
@@ -0,0 +1,150 @@
+/*
+ * Perform aio writes to file and toggle O_DIRECT flag concurrently
+ * this may trigger race between file->f_flags read and modification
+ * unuligned aio allow to makes race window wider.
+ * Regression test for https://lkml.org/lkml/2014/10/8/545 CVE-2014-8086
+ * Patch proposed: http://www.spinics.net/lists/linux-ext4/msg45683.html
+ *
+ * Copyright (c) 2014 Dmitry Monakhov. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <libaio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#define BUF_SIZE 512
+#define LOOP_SECONDS 10
+
+
+static int do_aio_loop(int fd, void *buf)
+{
+ int err, ret;
+ struct io_context *ctx = NULL;
+ struct io_event ev;
+ struct iocb iocb, *iocbs[] = { &iocb };
+ struct timeval start, now, delta = { 0, 0 };
+
+ ret = 0;
+ err = io_setup(1, &ctx);
+ if (err) {
+ fprintf(stderr, "error %s during %s\n",
+ strerror(-err), "io_setup" );
+ return 1;
+ }
+ gettimeofday(&start, NULL);
+ while (1) {
+ io_prep_pwrite(&iocb, fd, buf, BUF_SIZE, BUF_SIZE);
+ err = io_submit(ctx, 1, iocbs);
+ if (err != 1) {
+ fprintf(stderr, "error %s during %s\n",
+ strerror(-err),
+ "io_submit");
+ ret = 1;
+ break;
+ }
+ err = io_getevents(ctx, 1, 1, &ev, NULL);
+ if (err != 1) {
+ fprintf(stderr, "error %s during %s\n",
+ strerror(-err),
+ "io_getevents");
+ ret = 1;
+ break;
+ }
+ gettimeofday(&now, NULL);
+ timersub(&now, &start, &delta);
+ if (delta.tv_sec >= LOOP_SECONDS)
+ break;
+ }
+ io_destroy(ctx);
+ return ret;
+}
+
+int main(int argc, char **argv)
+{
+ int flags, fd;
+ int pid1, pid2 = 0;
+ int ret1, ret = 0;
+
+ if (argc != 2){
+ printf("Usage %s fname\n", argv[0]);
+ return 1;
+ }
+ fd = open(argv[1], O_CREAT | O_TRUNC | O_RDWR, 0600);
+ if (fd < 0)
+ return 1;
+
+ pid1 = fork();
+ if (pid1 < 0)
+ return 1;
+
+ if (pid1 == 0) {
+ struct timeval start, now, delta = { 0, 0 };
+
+ gettimeofday(&start, NULL);
+
+ /* child: toggle O_DIRECT*/
+ flags = fcntl(fd, F_GETFL);
+ while (1) {
+ ret = fcntl(fd, F_SETFL, flags | O_DIRECT);
+ if (ret)
+ return ret;
+ ret = fcntl(fd, F_SETFL, flags);
+ if (ret)
+ return ret;
+
+ gettimeofday(&now, NULL);
+ timersub(&now, &start, &delta);
+ if (delta.tv_sec >= LOOP_SECONDS)
+ break;
+ }
+ } else {
+ /* parent: AIO */
+ void *buf;
+ posix_memalign(&buf, BUF_SIZE, BUF_SIZE);
+ /* Two tasks which performs unaligned aio will be serialized
+ which maks race window wider */
+ pid2 = fork();
+ if (pid2 < 0)
+ goto out;
+ else if (pid2 > 0)
+ printf("All tasks are spawned\n");
+
+ ret = do_aio_loop(fd, buf);
+ }
+out:
+ /* Parent wait for all others */
+ if (pid2 > 0){
+ waitpid(pid1, &ret1, 0);
+ if (!ret)
+ ret = ret1;
+ waitpid(pid2, &ret1, 0);
+ } else {
+ waitpid(pid1, &ret1, 0);
+ }
+ if (!ret)
+ ret = ret1;
+
+ return ret;
+}
diff --git a/tests/generic/036 b/tests/generic/036
new file mode 100755
index 0000000..0615dad
--- /dev/null
+++ b/tests/generic/036
@@ -0,0 +1,51 @@
+#! /bin/bash
+# FS QA Test No. 036
+#
+# CVE-2014-8086
+# Run aio-dio-fcntl-race - test aio write race with O_DIRECT toggle
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2014 Dmitry Monakhov. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+
+_supported_fs generic
+_supported_os Linux
+_require_test
+
+_run_aiodio aio-dio-fcntl-race
+
+exit $status
diff --git a/tests/generic/036.out b/tests/generic/036.out
new file mode 100644
index 0000000..59719d6
--- /dev/null
+++ b/tests/generic/036.out
@@ -0,0 +1,2 @@
+QA output created by 036
+All tasks are spawned
diff --git a/tests/generic/group b/tests/generic/group
index 9c82a6f..d6629a8 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -38,6 +38,7 @@
033 auto quick rw
034 auto quick metadata log
035 auto quick
+036 auto aio rw stress
053 acl repair auto quick
062 attr udf auto quick
068 other auto freeze dangerous stress
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] xfstests: update 'new' script v3
2014-10-23 11:08 [PATCH 1/2] xfstests: update 'new' script v3 Dmitry Monakhov
2014-10-23 11:08 ` [PATCH 2/2] add aio/dio regression test race between write and fcntl V5 Dmitry Monakhov
@ 2014-11-10 1:58 ` Dave Chinner
1 sibling, 0 replies; 3+ messages in thread
From: Dave Chinner @ 2014-11-10 1:58 UTC (permalink / raw)
To: Dmitry Monakhov; +Cc: fstests, linux-ext4
Hi Dimitry,
On Thu, Oct 23, 2014 at 03:08:37PM +0400, Dmitry Monakhov wrote:
> From: root <root@ts105.qa.sw.ru>
I think there is a problem with your git repo config....
> - Update script to support new test cheme tests/$fs_type/$TEST_IDX
> - Try to use first unused ID
>
> changes from v2
> - gawk->$AWK_PROG
>
> Reviewed-by: Eryu Guan <eguan@redhat.com>
And it's also missing your sign-off.
The previous versions were correctly attributed, I'll pull them from
those patches, but please be a little more careful about this next
time...
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-10 1:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-23 11:08 [PATCH 1/2] xfstests: update 'new' script v3 Dmitry Monakhov
2014-10-23 11:08 ` [PATCH 2/2] add aio/dio regression test race between write and fcntl V5 Dmitry Monakhov
2014-11-10 1:58 ` [PATCH 1/2] xfstests: update 'new' script v3 Dave Chinner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.