From patchwork Mon May 20 22:31:21 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: 10952473 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 8AD8214B6 for ; Mon, 20 May 2019 22:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 795B42892D for ; Mon, 20 May 2019 22:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69B2528965; Mon, 20 May 2019 22:31:34 +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 C57A12893F for ; Mon, 20 May 2019 22:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726619AbfETWbd (ORCPT ); Mon, 20 May 2019 18:31:33 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:38024 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbfETWbd (ORCPT ); Mon, 20 May 2019 18:31:33 -0400 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 x4KMSXnX106745; Mon, 20 May 2019 22:31:31 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=P8EpcQu/1XJbNjvlqFYXddpRMt/yVdMojn90j1qTkUY=; b=KODyx64xQ2wULq/8tyUqLz4bcrb6W4KNCeZbjsU5NRZCGzqUUvhpCGbyHsiC5Ac1QnCN Lzt5iwcH9aSZdP3O8cCNsGXsA5JHN0kYBmSJysKsJfjG8jtYccbkTx4XCh1G0ZhCGQUq 20fVjCJn7jeJIYQ0je3n1Yo1hamqfOPtYkKGnS9euXz8LC4f0O/PE68MQBoOPWu0OLIi j97soyJ60yMNH9ZW7wUWQ9SzdRAR2aHDabx4h7KFtYQmfyoVbSdjZkK0Oo9jUciD5vwm 4VOuIhOkHNIZ2N7dOY4f6E2zjuI5TYSagllTLSGSwgjA2Jp0A2wulxEQI/k+fQvAHSql Wg== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 2sj9ft9vkm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2019 22:31:31 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4KMVUww040026; Mon, 20 May 2019 22:31:30 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 2sks1xutjj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 May 2019 22:31:30 +0000 Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x4KMVTg9026019; Mon, 20 May 2019 22:31:29 GMT Received: from localhost (/10.159.247.197) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 20 May 2019 22:31:29 +0000 Subject: [PATCH ] xfs: validate unicode filesystem labels From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Mon, 20 May 2019 15:31:21 -0700 Message-ID: <155839148145.62788.12360648352651333398.stgit@magnolia> In-Reply-To: <155839147529.62788.4514473233887834647.stgit@magnolia> References: <155839147529.62788.4514473233887834647.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9263 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905200138 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9263 signatures=668687 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-1905200138 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 Make sure we can set and retrieve unicode labels, including emoji. Signed-off-by: Darrick J. Wong --- common/rc | 18 ++++++ tests/generic/453 | 16 ------ tests/generic/454 | 16 ------ tests/xfs/739 | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/739.out | 2 + tests/xfs/group | 1 6 files changed, 175 insertions(+), 30 deletions(-) create mode 100755 tests/xfs/739 create mode 100644 tests/xfs/739.out diff --git a/common/rc b/common/rc index f577e5e3..17b89d5d 100644 --- a/common/rc +++ b/common/rc @@ -4014,6 +4014,24 @@ _try_wipe_scratch_devs() done } +# Only run this on xfs if xfs_scrub is available and has the unicode checker +_check_xfs_scrub_does_unicode() { + [ "${FSTYP}" == "xfs" ] || return 1 + + local mount="$1" + local dev="$2" + + _supports_xfs_scrub "${mount}" "${dev}" || return 1 + + # We only care if xfs_scrub has unicode string support... + if ! type ldd > /dev/null 2>&1 || \ + ! ldd "${XFS_SCRUB_PROG}" | grep -q libicui18n; then + return 1 + fi + + return 0 +} + init_rc ################################################################################ diff --git a/tests/generic/453 b/tests/generic/453 index 2396d62c..7dbadb02 100755 --- a/tests/generic/453 +++ b/tests/generic/453 @@ -219,21 +219,7 @@ done echo "Test XFS online scrub, if applicable" -# Only run this on xfs if xfs_scrub is available and has the unicode checker -check_xfs_scrub() { - [ "$FSTYP" == "xfs" ] || return 1 - _supports_xfs_scrub "$SCRATCH_MNT" "$SCRATCH_DEV" || return 1 - - # We only care if xfs_scrub has unicode string support... - if ! type ldd > /dev/null 2>&1 || \ - ! ldd "${XFS_SCRUB_PROG}" | grep -q libicui18n; then - return 1 - fi - - return 0 -} - -if check_xfs_scrub; then +if _check_xfs_scrub_does_unicode "$SCRATCH_MNT" "$SCRATCH_DEV"; then output="$(LC_ALL="C.UTF-8" ${XFS_SCRUB_PROG} -v -n "${SCRATCH_MNT}" 2>&1 | filter_scrub)" echo "${output}" | grep -q "french_" || echo "No complaints about french e accent?" echo "${output}" | grep -q "greek_" || echo "No complaints about greek letter mess?" diff --git a/tests/generic/454 b/tests/generic/454 index 01986d6b..96a0ea28 100755 --- a/tests/generic/454 +++ b/tests/generic/454 @@ -186,21 +186,7 @@ test "${crazy_keys}" -ne "${expected_keys}" && echo "Expected ${expected_keys} k echo "Test XFS online scrub, if applicable" -# Only run this on xfs if xfs_scrub is available and has the unicode checker -check_xfs_scrub() { - [ "$FSTYP" == "xfs" ] || return 1 - _supports_xfs_scrub "$SCRATCH_MNT" "$SCRATCH_DEV" || return 1 - - # We only care if xfs_scrub has unicode string support... - if ! type ldd > /dev/null 2>&1 || \ - ! ldd "${XFS_SCRUB_PROG}" | grep -q libicui18n; then - return 1 - fi - - return 0 -} - -if check_xfs_scrub; then +if _check_xfs_scrub_does_unicode "$SCRATCH_MNT" "$SCRATCH_DEV"; then output="$(LC_ALL="C.UTF-8" ${XFS_SCRUB_PROG} -v -n "${SCRATCH_MNT}" 2>&1 | filter_scrub)" echo "${output}" | grep -q "french_" || echo "No complaints about french e accent?" echo "${output}" | grep -q "greek_" || echo "No complaints about greek letter mess?" diff --git a/tests/xfs/739 b/tests/xfs/739 new file mode 100755 index 00000000..9b32ad0d --- /dev/null +++ b/tests/xfs/739 @@ -0,0 +1,152 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2019, Oracle and/or its affiliates. All Rights Reserved. +# +# FS QA Test No. 739 +# +# Create a directory with multiple filenames that all appear the same +# (in unicode, anyway) but point to different inodes. In theory all +# Linux filesystems should allow this (filenames are a sequence of +# arbitrary bytes) even if the user implications are horrifying. +# +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() +{ + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +_supported_os Linux +_supported_fs xfs +_require_scratch_nocheck +_require_xfs_io_command 'label' + +echo "Silence is golden." + +want_scrub= +_check_xfs_scrub_does_unicode "$SCRATCH_MNT" "$SCRATCH_DEV" && want_scrub=yes + +filter_scrub() { + grep 'Unicode' | sed -e 's/^.*Duplicate/Duplicate/g' +} + +maybe_scrub() { + test "$want_scrub" = "yes" || return + + output="$(LC_ALL="C.UTF-8" ${XFS_SCRUB_PROG} -v -n "${SCRATCH_MNT}" 2>&1)" + echo "xfs_scrub output:" >> $seqres.full + echo "$output" >> $seqres.full + echo "$output" >> $tmp.scrub +} + +testlabel() { + local label="$(echo -e "$1")" + local expected_label="label = \"$label\"" + + echo "Formatting label '$1'." >> $seqres.full + # First, let's see if we can recover the label when we set it + # with mkfs. + _scratch_mkfs -L "$label" >> $seqres.full 2>&1 + _scratch_mount >> $seqres.full 2>&1 + blkid -s LABEL $SCRATCH_DEV | _filter_scratch | sed -e "s/ $//g" >> $seqres.full + blkid -d -s LABEL $SCRATCH_DEV | _filter_scratch | sed -e "s/ $//g" >> $seqres.full + + # Did it actually stick? + local actual_label="$($XFS_IO_PROG -c label $SCRATCH_MNT)" + echo "$actual_label" >> $seqres.full + + if [ "${actual_label}" != "${expected_label}" ]; then + echo "Saw '${expected_label}', expected '${actual_label}'." + fi + maybe_scrub + _scratch_unmount + + # Now let's try setting the label online to see what happens. + echo "Setting label '$1'." >> $seqres.full + _scratch_mkfs >> $seqres.full 2>&1 + _scratch_mount >> $seqres.full 2>&1 + $XFS_IO_PROG -c "label -s $label" $SCRATCH_MNT >> $seqres.full + blkid -s LABEL $SCRATCH_DEV | _filter_scratch | sed -e "s/ $//g" >> $seqres.full + blkid -d -s LABEL $SCRATCH_DEV | _filter_scratch | sed -e "s/ $//g" >> $seqres.full + _scratch_cycle_mount + + # Did it actually stick? + local actual_label="$($XFS_IO_PROG -c label $SCRATCH_MNT)" + echo "$actual_label" >> $seqres.full + + if [ "${actual_label}" != "${expected_label}" ]; then + echo "Saw '${expected_label}'; expected '${actual_label}'." + fi + maybe_scrub + _scratch_unmount +} + +# Simple test +testlabel "simple" + +# Two different renderings of the same label +testlabel "caf\xc3\xa9.fs" +testlabel "cafe\xcc\x81.fs" + +# Arabic code point can expand into a muuuch longer series +testlabel "xfs_\xef\xb7\xba.fs" + +# Fake slash? +testlabel "urk\xc0\xafmoo" + +# Emoji: octopus butterfly owl giraffe +testlabel "\xf0\x9f\xa6\x91\xf0\x9f\xa6\x8b\xf0\x9f\xa6\x89" + +# unicode rtl widgets too... +testlabel "mo\xe2\x80\xaegnp.txt" +testlabel "motxt.png" + +# mixed-script confusables +testlabel "mixed_t\xce\xbfp" +testlabel "mixed_top" + +# single-script spoofing +testlabel "a\xe2\x80\x90b.fs" +testlabel "a-b.fs" + +testlabel "dz_dze.fs" +testlabel "dz_\xca\xa3e.fs" + +# symbols +testlabel "_Rs.fs" +testlabel "_\xe2\x82\xa8.fs" + +# zero width joiners +testlabel "moocow.fs" +testlabel "moo\xe2\x80\x8dcow.fs" + +# combining marks +testlabel "\xe1\x80\x9c\xe1\x80\xad\xe1\x80\xaf.fs" +testlabel "\xe1\x80\x9c\xe1\x80\xaf\xe1\x80\xad.fs" + +# fake dotdot entry +testlabel ".\xe2\x80\x8d" +testlabel "..\xe2\x80\x8d" + +# Did scrub choke on anything? +if [ "$want_scrub" = "yes" ]; then + grep -q "^Warning.*gnp.txt.*suspicious text direction" $tmp.scrub || \ + echo "No complaints about direction overrides?" + grep -q "^Warning.*control characters" $tmp.scrub || \ + echo "No complaints about control characters?" +fi + +# success, all done +status=0 +exit diff --git a/tests/xfs/739.out b/tests/xfs/739.out new file mode 100644 index 00000000..b2697ba1 --- /dev/null +++ b/tests/xfs/739.out @@ -0,0 +1,2 @@ +QA output created by 739 +Silence is golden. diff --git a/tests/xfs/group b/tests/xfs/group index e71b058f..c8620d72 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -501,3 +501,4 @@ 501 auto quick unlink 502 auto quick unlink 503 auto copy metadump +739 auto quick mkfs label