From patchwork Tue Feb 12 02:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10807201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96E3817E0 for ; Tue, 12 Feb 2019 02:17:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 883BD2B2B9 for ; Tue, 12 Feb 2019 02:17:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A1092B2BC; Tue, 12 Feb 2019 02:17:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5A642B2BB for ; Tue, 12 Feb 2019 02:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727642AbfBLCRg (ORCPT ); Mon, 11 Feb 2019 21:17:36 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:36346 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727631AbfBLCRg (ORCPT ); Mon, 11 Feb 2019 21:17:36 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1C2EQ1g023605; Tue, 12 Feb 2019 02:17:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=vL8NdaOmgooRh5/cpX3A62m9AJGRxu7XO/5y9iJNNfQ=; b=Jrl4f0x1w33M7tHM4u9YFUjKoDNE4u8mwi66K6WuUXrzHZSwIrErYL5VZJDIMug+U9mc FGElJ8J7DCH1+PtBctpqFsTW2g24RNvJmGdq/YpmS7qqaV8iFbBTq/hOpuEz2j0/wWYi 219huTBh77EvSVTLo6b7u65yzA1YRLPxk3xGbf4I5HrcOpUjtWO2U8DJsHnnUoQoZ5dV 8dVgha+tD1etv2iwvkg0n6Dni4/sG0SxwswJBqnDZT4yu/LnzBmd61t3Lq05EGliUdS1 I5LhBFDYkGwGG6FaslWdkbbx5ZgTd8X6Me3DFkO7Yv6rRy5+X2mLEEASuFPQVUd6T0gg Pg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2qhrek99kt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:33 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1C2HR3N009997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:27 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x1C2HRq7021699; Tue, 12 Feb 2019 02:17:27 GMT Received: from localhost (/10.159.237.14) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 Feb 2019 18:17:27 -0800 Subject: [PATCH 1/3] common: fix kmemleak to work with sections From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Mon, 11 Feb 2019 18:17:26 -0800 Message-ID: <154993784666.1948.2898373791588046149.stgit@magnolia> In-Reply-To: <154993784038.1948.7502664832930298472.stgit@magnolia> References: <154993784038.1948.7502664832930298472.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9164 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=914 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902120014 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Refactor the kmemleak code to work correctly with sections. This requires changing the location of the "is kmemleak enabled?" flag to use /tmp instead of RESULT_BASE, scanning for leaks after every test, and clarifying which functions get used when. Signed-off-by: Darrick J. Wong --- README | 2 ++ check | 7 +++++-- common/rc | 32 ++++++++++++++++++++++---------- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/README b/README index 73f057f3..6e9aa34d 100644 --- a/README +++ b/README @@ -99,6 +99,8 @@ Preparing system for tests: that relevant results are compared. For example 'spinningrust' for configurations that use spinning disks and 'nvme' for tests using nvme drives. + - set USE_KMEMLEAK=yes to scan for memory leaks in the kernel + after every test, if the kernel supports kmemleak. - or add a case to the switch in common/config assigning these variables based on the hostname of your test diff --git a/check b/check index 77a06b00..20e95302 100755 --- a/check +++ b/check @@ -496,7 +496,7 @@ _expunge_test() return 0 } -_init_kmemleak +_detect_kmemleak _prepare_test_list if $OPTIONS_HAVE_SECTIONS; then @@ -771,9 +771,12 @@ for section in $HOST_OPTIONS_SECTIONS; do # and log messages that shouldn't be there. _check_filesystems _check_dmesg || err=true - _check_kmemleak || err=true fi + # Scan for memory leaks after every test so that associating + # a leak to a particular test will be as accurate as possible. + _check_kmemleak || err=true + # test ends after all checks are done. $timestamp && _timestamp stop=`_wallclock` diff --git a/common/rc b/common/rc index b8ed1776..ab468adf 100644 --- a/common/rc +++ b/common/rc @@ -3500,7 +3500,7 @@ _check_dmesg() # capture the kmemleak report _capture_kmemleak() { - local kern_knob="${DEBUGFS_MNT}/kmemleak" + local kern_knob="$DEBUGFS_MNT/kmemleak" local leak_file="$1" # Tell the kernel to scan for memory leaks. Apparently the write @@ -3521,17 +3521,20 @@ ENDL echo "clear" > "$kern_knob" } -# set up kmemleak -_init_kmemleak() +# Figure out if the running kernel supports kmemleak; if it does, clear out +# anything that leaked before we even started testing. The leak checker only +# needs to be primed like this once per ./check invocation. +_detect_kmemleak() { - local kern_knob="${DEBUGFS_MNT}/kmemleak" + local kern_knob="$DEBUGFS_MNT/kmemleak" + KMEMLEAK_CHECK_FILE="/tmp/check_kmemleak" # Since kernel v4.19-rc3, the kmemleak knob exists even if kmemleak is # disabled, but returns EBUSY on write. So instead of relying on # existance of writable knob file, we use a test file to indicate that # _check_kmemleak() is enabled only if we actually managed to write to # the knob file. - rm -f ${RESULT_BASE}/check_kmemleak + rm -f "$KMEMLEAK_CHECK_FILE" if [ ! -w "$kern_knob" ]; then return 0 @@ -3541,17 +3544,26 @@ _init_kmemleak() # then dump all the leaks recorded so far. if echo "scan=off" > "$kern_knob" 2>/dev/null; then _capture_kmemleak /dev/null - touch ${RESULT_BASE}/check_kmemleak + touch "$KMEMLEAK_CHECK_FILE" fi } -# check kmemleak log +# Kick the kmemleak checker to scan for leaks. Background leak scan mode is +# not enabled, so we must call the kernel to ask for a scan and deal with the +# results appropriately. This we do after every test completes, whether or not +# it was successful. _check_kmemleak() { - local kern_knob="${DEBUGFS_MNT}/kmemleak" - local leak_file="${seqres}.kmemleak" + local kern_knob="$DEBUGFS_MNT/kmemleak" + local leak_file="$seqres.kmemleak" - if [ ! -f ${RESULT_BASE}/check_kmemleak ]; then + if [ ! -f "$KMEMLEAK_CHECK_FILE" ]; then + return 0 + fi + + # Not enabled, so discard any report of leaks found. + if [ "$USE_KMEMLEAK" != "yes" ]; then + _capture_kmemleak /dev/null return 0 fi From patchwork Tue Feb 12 02:17:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10807205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EEB817E0 for ; Tue, 12 Feb 2019 02:17:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7015B2B2B9 for ; Tue, 12 Feb 2019 02:17:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 648152B2C7; Tue, 12 Feb 2019 02:17:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2122B2B2BC for ; Tue, 12 Feb 2019 02:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727631AbfBLCRm (ORCPT ); Mon, 11 Feb 2019 21:17:42 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:49830 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727265AbfBLCRm (ORCPT ); Mon, 11 Feb 2019 21:17:42 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1C2EVKq030369; Tue, 12 Feb 2019 02:17:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=8ncU9URmQY1BKpXWQQlbR7kLiLFHXGvHkILnieECpf4=; b=OpearEEcHYHpblN+Ft6R/pRb3pmV3g4mXrVvTUKO3hGW2gg6k5QhlrxwFKRE1dTtgQky uOJrFHYO8bh1so/T37t+hNBG10dyOEUpHHDRfZI9MFWqpOLY/piKcDu+oMSaLfXoEpni rEzCWIfFa91XkSqWQRamHzkzBsrFnJ2z0UzWe1/3tjbpDyR3PTJ5wp6WUzmvQnBMS41r U2q8ts3YFywwVGrecZdeNGykkTtoC8SBPZV5a//VOuf1HyJrwT4MGW4g3J66riRkJ34M ExkY6aVsihGisKaS0N8WXxGCggvrED4umwpKOAdF9trt2NnZ1c+IUnyGgmcF2vwGMTiw HA== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2qhredsac7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:40 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x1C2HYFp002054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:34 GMT Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1C2HY1d032277; Tue, 12 Feb 2019 02:17:34 GMT Received: from localhost (/10.159.237.14) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 Feb 2019 18:17:33 -0800 Subject: [PATCH 2/3] common: fix _require_btime for lazy filesystems From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Mon, 11 Feb 2019 18:17:32 -0800 Message-ID: <154993785290.1948.9192893627999402298.stgit@magnolia> In-Reply-To: <154993784038.1948.7502664832930298472.stgit@magnolia> References: <154993784038.1948.7502664832930298472.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9164 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=946 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902120014 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Filesystems are not required to try to fill the statx btime field unless the caller actually sets STATX_BTIME. They're allowed to volunteer that information "if it's cheap", but XFS doesn't volunteer and there may be filesystems that support btime but not cheaply. Either way, we want to test btime on any filesystem that supports it, cheaply or otherwise, so set STATX_BTIME when we're trying to detect support for it. Signed-off-by: Darrick J. Wong --- common/rc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index ab468adf..6fb71e60 100644 --- a/common/rc +++ b/common/rc @@ -3849,7 +3849,11 @@ _dmsetup_create() _require_btime() { - $XFS_IO_PROG -f $TEST_DIR/test_creation_time -c "statx -v" \ + # Note: filesystems are not required to report btime (creation time) + # if the caller doesn't ask for it, so we define STATX_BTIME here and + # pass it in to the statx command. + export STATX_BTIME=0x800 + $XFS_IO_PROG -f $TEST_DIR/test_creation_time -c "statx -m $STATX_BTIME -v" \ | grep btime >>$seqres.full 2>&1 || \ _notrun "inode creation time not supported by this filesystem" rm -f $TEST_DIR/test_creation_time From patchwork Tue Feb 12 02:17:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10807209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B19F31575 for ; Tue, 12 Feb 2019 02:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2DB82B2B9 for ; Tue, 12 Feb 2019 02:17:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 968A82B2BC; Tue, 12 Feb 2019 02:17:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35B722B2BE for ; Tue, 12 Feb 2019 02:17:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727652AbfBLCRo (ORCPT ); Mon, 11 Feb 2019 21:17:44 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:49852 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727265AbfBLCRo (ORCPT ); Mon, 11 Feb 2019 21:17:44 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1C2FrjV031266; Tue, 12 Feb 2019 02:17:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=aY+MXP1VHN+k7RsxormnKgrE+PCUOsv1aaL4KW0M7eI=; b=PunSEoATY+e2cB1mfttMGY777+A+2M+iHL182CIZiRcugangdhiJtldGOJwSPB7UCzTZ 3mnyrvV2PxBWZGk/X0aRQI4TPGlQd/akCj5777xklREslnXAXBeatdeG6KEpCX6yErj/ iT7xjTH9kFd9215xV54pNf7O3re9gZ2ZZccJ4IbwCjUEZAOdBReT5ZAhlp0JFCLywSlW 94guaM5hkfxo6uhSCbKgOvTuTiBXeeX38NMMFPxaIYkkDWCI0sL329llMw8+ylUmdGdD G1lmYMJCsOj6QC84ZcaJxp1bVutBjbHTXDTyAFMREd7mmvSABM0ZDv+Z3f7PDD5C9Khl FA== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2qhredsaca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:42 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x1C2He2v004965 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Feb 2019 02:17:41 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x1C2He4s012174; Tue, 12 Feb 2019 02:17:40 GMT Received: from localhost (/10.159.237.14) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 Feb 2019 18:17:40 -0800 Subject: [PATCH 3/3] generic: check for reasonable inode creation time From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Mon, 11 Feb 2019 18:17:39 -0800 Message-ID: <154993785921.1948.13721935036926653125.stgit@magnolia> In-Reply-To: <154993784038.1948.7502664832930298472.stgit@magnolia> References: <154993784038.1948.7502664832930298472.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9164 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902120014 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong If statx returns inode creation time (aka btime), check it to make sure that the filesystem is setting a creation time that's reasonably close to when it creates a file. Signed-off-by: Darrick J. Wong --- tests/generic/709 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/709.out | 2 ++ tests/generic/group | 1 + 3 files changed, 56 insertions(+) create mode 100755 tests/generic/709 create mode 100644 tests/generic/709.out diff --git a/tests/generic/709 b/tests/generic/709 new file mode 100755 index 00000000..ebec10de --- /dev/null +++ b/tests/generic/709 @@ -0,0 +1,53 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2019 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 709 +# +# Check that statx btime (aka creation time) is plausibly close to when +# we created a file. A bug caught during code review of xfs patches revealed +# that there weren't any sanity checks of the btime values. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +testfile=$TEST_DIR/$seq.txt +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* $testfile +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/attr +. ./common/filter + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_test +_require_xfs_io_command "statx" "-r" +_require_btime + +rm -f $seqres.full +rm -f $testfile + +# Create a file and the time we created it +now=$(date +%s) +touch $testfile + +# Make sure the reported btime is within 5 seconds of the time we recorded +# just prior to creating the file. +btime=$(date +%s -d "$($XFS_IO_PROG -c "statx -v -m $STATX_BTIME" $testfile | \ + grep 'stat.btime =' | cut -d '=' -f 2)") +test -n "$btime" || echo "error: did not see btime in output??" + +_within_tolerance "btime" "$btime" "$now" 0 5 -v + +status=0 +exit diff --git a/tests/generic/709.out b/tests/generic/709.out new file mode 100644 index 00000000..d8495ace --- /dev/null +++ b/tests/generic/709.out @@ -0,0 +1,2 @@ +QA output created by 709 +btime is in range diff --git a/tests/generic/group b/tests/generic/group index cfd003d3..f56eb475 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -528,3 +528,4 @@ 523 auto quick attr 524 auto quick 525 auto quick rw +709 auto quick From patchwork Wed Feb 13 20:48:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10810869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E31D13B4 for ; Wed, 13 Feb 2019 20:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BF1C2D588 for ; Wed, 13 Feb 2019 20:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6011C2D5A3; Wed, 13 Feb 2019 20:48:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CECF12D5A2 for ; Wed, 13 Feb 2019 20:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730310AbfBMUsT (ORCPT ); Wed, 13 Feb 2019 15:48:19 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:59680 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727251AbfBMUsT (ORCPT ); Wed, 13 Feb 2019 15:48:19 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x1DKcgOC133269; Wed, 13 Feb 2019 20:48:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=96T+vv41WaYZelqL5XLRTduJLeVvOHXwBzzIhfSK+N8=; b=Z6kcXp5oy14dil1nkgKmV/EoDLi7nSpTkwKak4aBTkNZp2+9P+p1VFWLWGRhEh3f36dy 5Q5m137orDB64+pJ6tlDDyJr+8lLNrT76O8lHh26mPWAoPD3rBfNkFUenBp4nevj6p/d o+p4XFe6oYR/mh8wXwxJJNSJihG9+ObcAS0BnGZfhkjB9nGHvDErxZtNTg8aGu4jteit sjdsx6IcMqRQlQiSFUPyS6KKLD1Kwm6bheR8dL0vQ/rpZwsJhSssSbmfPGcNtuHXpVog gt3vDEJ83RNBJiGxkB0/puXFYOUEgoucVM45FnFU4q2+d+lJQHg3Ban2RB8PVt0vCxVJ 6g== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2qhrekmcen-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 20:48:16 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x1DKmGpe027754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Feb 2019 20:48:16 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x1DKmGOW024083; Wed, 13 Feb 2019 20:48:16 GMT Received: from localhost (/10.159.239.14) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Feb 2019 20:48:15 +0000 Date: Wed, 13 Feb 2019 12:48:14 -0800 From: "Darrick J. Wong" To: guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 4/3] generic: posix acl extended attribute memory corruption test Message-ID: <20190213204814.GB6477@magnolia> References: <154993784038.1948.7502664832930298472.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <154993784038.1948.7502664832930298472.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9166 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902130138 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong XFS had a use-after-free bug when xfs_xattr_put_listent runs out of listxattr buffer space while trying to store the name "system.posix_acl_access" and then corrupts memory by not checking the seen_enough state and then trying to shove "trusted.SGI_ACL_FILE" into the buffer as well. In order to tickle the bug in a user visible way we must have already put a name in the buffer, so we take advantage of the fact that "security.evm" sorts before "system.posix_acl_access" to make sure this happens. Signed-off-by: Darrick J. Wong --- .gitignore | 1 src/Makefile | 2 - src/t_attr_corruption.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/712 | 41 ++++++++++++++++ tests/generic/712.out | 2 + tests/generic/group | 1 6 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 src/t_attr_corruption.c create mode 100755 tests/generic/712 create mode 100644 tests/generic/712.out diff --git a/.gitignore b/.gitignore index ea1aac8a..0933dc7d 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ /src/stat_test /src/swapon /src/t_access_root +/src/t_attr_corruption /src/t_dir_offset /src/t_dir_offset2 /src/t_dir_type diff --git a/src/Makefile b/src/Makefile index 41826585..ae09eb0a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -27,7 +27,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ renameat2 t_getcwd e4compact test-nextquota punch-alternating \ attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ - attr_replace_test swapon mkswap + attr_replace_test swapon mkswap t_attr_corruption SUBDIRS = log-writes perf diff --git a/src/t_attr_corruption.c b/src/t_attr_corruption.c new file mode 100644 index 00000000..1fa5e41f --- /dev/null +++ b/src/t_attr_corruption.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Oracle. All Rights Reserved. + * Author: Darrick J. Wong + * + * Test program to tickle a use-after-free bug in xfs. + * + * XFS had a use-after-free bug when xfs_xattr_put_listent runs out of + * listxattr buffer space while trying to store the name + * "system.posix_acl_access" and then corrupts memory by not checking the + * seen_enough state and then trying to shove "trusted.SGI_ACL_FILE" into the + * buffer as well. + * + * In order to tickle the bug in a user visible way we must have already put a + * name in the buffer, so we take advantage of the fact that "security.evm" + * sorts before "system.posix_acl_access" to make sure this happens. + * + * If we trigger the bug, the program will print the garbled string + * "rusted.SGI_ACL_FILE". If the bug is fixed, the flistxattr call returns + * ERANGE. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void die(const char *msg) +{ + perror(msg); + exit(1); +} + +struct entry { + uint16_t a; + uint16_t b; + uint32_t c; +}; + +struct myacl { + uint32_t d; + struct entry e[4]; +}; + +int main(int argc, char *argv[]) +{ + struct myacl acl = { + .d = 2, + .e = { + {1, 0, 0}, + {4, 0, 0}, + {0x10, 0, 0}, + {0x20, 0, 0}, + }, + }; + char buf[64]; + ssize_t sz; + int fd; + int ret; + + if (argc > 1) { + ret = chdir(argv[1]); + if (ret) + die(argv[1]); + } + + fd = creat("file0", 0644); + if (fd < 0) + die("create"); + + ret = fsetxattr(fd, "system.posix_acl_access", &acl, sizeof(acl), 0); + if (ret) + die("set posix acl"); + + ret = fsetxattr(fd, "security.evm", buf, 1, 1); + if (ret) + die("set evm"); + + sz = flistxattr(fd, buf, 30); + if (sz < 0) + die("list attr"); + + printf("%s\n", buf); + + return 0; + +#if 0 + /* original syzkaller reproducer */ + + syscall(__NR_mmap, 0x20000000, 0x1000000, 3, 0x32, -1, 0); + + memcpy((void*)0x20000180, "./file0", 8); + syscall(__NR_creat, 0x20000180, 0); + memcpy((void*)0x20000000, "./file0", 8); + memcpy((void*)0x20000040, "system.posix_acl_access", 24); + *(uint32_t*)0x20000680 = 2; + *(uint16_t*)0x20000684 = 1; + *(uint16_t*)0x20000686 = 0; + *(uint32_t*)0x20000688 = 0; + *(uint16_t*)0x2000068c = 4; + *(uint16_t*)0x2000068e = 0; + *(uint32_t*)0x20000690 = 0; + *(uint16_t*)0x20000694 = 0x10; + *(uint16_t*)0x20000696 = 0; + *(uint32_t*)0x20000698 = 0; + *(uint16_t*)0x2000069c = 0x20; + *(uint16_t*)0x2000069e = 0; + *(uint32_t*)0x200006a0 = 0; + syscall(__NR_setxattr, 0x20000000, 0x20000040, 0x20000680, 0x24, 0); + memcpy((void*)0x20000080, "./file0", 8); + memcpy((void*)0x200000c0, "security.evm", 13); + memcpy((void*)0x20000100, "\x03\x00\x00\x00\x57", 5); + syscall(__NR_lsetxattr, 0x20000080, 0x200000c0, 0x20000100, 1, 1); + memcpy((void*)0x20000300, "./file0", 8); + syscall(__NR_listxattr, 0x20000300, 0x200002c0, 0x1e); + return 0; +#endif +} diff --git a/tests/generic/712 b/tests/generic/712 new file mode 100755 index 00000000..6348a797 --- /dev/null +++ b/tests/generic/712 @@ -0,0 +1,41 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2019 Oracle, Inc. All Rights Reserved. +# +# FS QA Test No. 712 +# +# Regression test for a bug where XFS corrupts memory if the listxattr buffer +# is a particularly well crafted size on a filesystem that supports posix acls. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! +testfile=$TEST_DIR/$seq.txt +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/attr + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_acls +_require_scratch + +rm -f $seqres.full +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount + +src/t_attr_corruption $SCRATCH_MNT + +status=0 +exit diff --git a/tests/generic/712.out b/tests/generic/712.out new file mode 100644 index 00000000..a2ba09f3 --- /dev/null +++ b/tests/generic/712.out @@ -0,0 +1,2 @@ +QA output created by 712 +list attr: Numerical result out of range diff --git a/tests/generic/group b/tests/generic/group index f56eb475..b3086154 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -529,3 +529,4 @@ 524 auto quick 525 auto quick rw 709 auto quick +712 auto quick attr