From patchwork Wed Dec 21 21:21:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9483791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F1A1601D2 for ; Wed, 21 Dec 2016 21:24:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4079D284DA for ; Wed, 21 Dec 2016 21:24:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35605284D1; Wed, 21 Dec 2016 21:24:46 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 A2F77284DD for ; Wed, 21 Dec 2016 21:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758193AbcLUVYn (ORCPT ); Wed, 21 Dec 2016 16:24:43 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35456 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758202AbcLUVYm (ORCPT ); Wed, 21 Dec 2016 16:24:42 -0500 Received: by mail-pg0-f66.google.com with SMTP id i5so7985711pgh.2 for ; Wed, 21 Dec 2016 13:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tKAMzE5CdZtSRSVgx/EBARtNWhrKb7dLdCbi+L3Vk2g=; b=Iuut/9auSJCGXaWzeZWTNh5Zk2qW9Ba85bZlA8huiMf7FExUlaAC7sEN59ZZ3C2JSh vPWMlmIjD0u+vZn6CVwSauzmRcYocieYBT1/uQE68iWfK+gaiqqyMmbhInAptFsXR5T6 CuOlvfy4/B0CGM+6Sw77xVgA6Ueqm/9gv21OKpTD3CyKT3XUn4x358c3Xs4Om0DuXP9k yql6lpEHq0nhpjMq/wfeMdOCUch3yxWVM3lm0dLi058VQ9XuLITEqKGMm1fW4evfOqZ5 Bftxm9FEzfkg9TFXVNLT+6WClM8GXSExWJPT9WhIIOd1BX24eYZmtRcjo8O2gtx4Af+g kyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tKAMzE5CdZtSRSVgx/EBARtNWhrKb7dLdCbi+L3Vk2g=; b=irEFtYGF23lVPsmmVTbX651QDWmS72HRbL9oA/d3xvsTtJvYC8nsnYuADO2647CJkq n6mSOWDvuh7TjR60H/sUukOfoNTh9jLgPOSE3ikV98XC/N+DlTa/U+OnElVwjQP57sv4 V0skm11jv6MactAtz36toT0t9btT9U5lJ8dzzbDz9g25CxqEs/vuGgDCRivBdwm3Ooin MgJ/xVk4XLrd9AC6DR/TNrSNOuX9a+E9fQ0QjZHHYFvh2VPJneSlR6QB3xTf4LVYl1ab Y9QFV11wL0arWv71drD6wsh1Fy+R2eEzQRTwzMQGFu98c9xxVaFkCZV1i8297rjD3KmH fbAA== X-Gm-Message-State: AIkVDXL/swcz/wBxBhxSWG1kSLCSHeFrv65lj+kovWoe/p1BX3Rer9dmq7zSnCgYPXPOeQ== X-Received: by 10.84.193.129 with SMTP id f1mr12532892pld.129.1482355476714; Wed, 21 Dec 2016 13:24:36 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id 13sm49035453pfz.30.2016.12.21.13.24.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Dec 2016 13:24:35 -0800 (PST) From: Eric Biggers To: fstests@vger.kernel.org Cc: Theodore Ts'o , Jaegeuk Kim , Richard Weinberger , David Gstir , Michael Halcrow , Eric Sandeen , Eric Biggers Subject: [PATCH v5 3/6] generic: test validation of encryption policy structure Date: Wed, 21 Dec 2016 13:21:59 -0800 Message-Id: <1482355322-74978-4-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1482355322-74978-1-git-send-email-ebiggers3@gmail.com> References: <1482355322-74978-1-git-send-email-ebiggers3@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Add an xfstest which verifies the kernel performs basic validation of the encryption policy structure. Signed-off-by: Eric Biggers --- tests/generic/401 | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/401.out | 18 +++++++++++ tests/generic/group | 1 + 3 files changed, 101 insertions(+) create mode 100755 tests/generic/401 create mode 100644 tests/generic/401.out diff --git a/tests/generic/401 b/tests/generic/401 new file mode 100755 index 0000000..1c9d964 --- /dev/null +++ b/tests/generic/401 @@ -0,0 +1,82 @@ +#! /bin/bash +# FS QA Test generic/401 +# +# Test that FS_IOC_SET_ENCRYPTION_POLICY correctly validates the fscrypt_policy +# structure that userspace passes to it. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Google, Inc. All Rights Reserved. +# +# Author: Eric Biggers +# +# 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 +. ./common/encrypt + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_scratch_encryption +_require_xfs_io_command "set_encpolicy" + +_scratch_mkfs_encrypted &>> $seqres.full +_scratch_mount +dir=$SCRATCH_MNT/dir +mkdir $dir + +echo -e "\n*** Invalid contents encryption mode ***" +$XFS_IO_PROG -c "set_encpolicy -c 0xFF" $dir |& _filter_scratch + +echo -e "\n*** Invalid filenames encryption mode ***" +$XFS_IO_PROG -c "set_encpolicy -n 0xFF" $dir |& _filter_scratch + +echo -e "\n*** Invalid flags ***" +$XFS_IO_PROG -c "set_encpolicy -f 0xFF" $dir |& _filter_scratch + +echo -e "\n*** Invalid policy version ***" +$XFS_IO_PROG -c "set_encpolicy -v 0xFF" $dir |& _filter_scratch + +# Currently, the only supported combination of modes is AES-256-XTS for contents +# and AES-256-CTS for filenames. Nothing else should be accepted. +echo -e "\n*** Invalid combinations of modes ***" +$XFS_IO_PROG -c "set_encpolicy -c AES-256-CTS -n AES-256-CTS" $dir |& _filter_scratch +$XFS_IO_PROG -c "set_encpolicy -c AES-256-CTS -n AES-256-XTS" $dir |& _filter_scratch +$XFS_IO_PROG -c "set_encpolicy -c AES-256-XTS -n AES-256-XTS" $dir |& _filter_scratch + +# success, all done +status=0 +exit diff --git a/tests/generic/401.out b/tests/generic/401.out new file mode 100644 index 0000000..ea349cc --- /dev/null +++ b/tests/generic/401.out @@ -0,0 +1,18 @@ +QA output created by 401 + +*** Invalid contents encryption mode *** +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument + +*** Invalid filenames encryption mode *** +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument + +*** Invalid flags *** +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument + +*** Invalid policy version *** +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument + +*** Invalid combinations of modes *** +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument +SCRATCH_MNT/dir: failed to set encryption policy: Invalid argument diff --git a/tests/generic/group b/tests/generic/group index 3ecd8e9..3fa745d 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -398,3 +398,4 @@ 393 auto quick rw 394 auto quick 400 auto quick encrypt +401 auto quick encrypt