From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A72E5C43613 for ; Sat, 22 Jun 2019 22:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78E9F2089C for ; Sat, 22 Jun 2019 22:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561241499; bh=UNW2ihZinuy71YqpXq2iIU53Glk0HBws/GqjfYmygj4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Ee81yXFPiFQ9mbxQEUlwJYXcqzJV4kLxroaZgeIhIoG+ISmq0pqjN9gU2jvcrqlmG jQGFLE2OdJc+et84h+Or4Z3IIklOw8qITv29iEXEbshgNFodtppvee/dvc/wfI5Q3e uwrGIqf116Lvo78fSqIqRFroi3ut+K2WzxmGF9Y0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726420AbfFVWLj (ORCPT ); Sat, 22 Jun 2019 18:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:47492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbfFVWLi (ORCPT ); Sat, 22 Jun 2019 18:11:38 -0400 Received: from localhost (unknown [104.132.1.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34C3120862; Sat, 22 Jun 2019 22:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561241497; bh=UNW2ihZinuy71YqpXq2iIU53Glk0HBws/GqjfYmygj4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=nssxLDzxoLPgRVQIlKQrkCTqpZmIgPEermLY+Ak/hHUUta860YqAXqE7hozR1ad2w 3PraRHU/peJCcXbryrIgxCTLdobJw38CE4oSHfNBA8p7FGYDcUkV8ALCvkTgUb1Dti 3BGQ2uoP0sgFNl+NmhSgsLX80FjX12rK+Ji/0uP4= Date: Sat, 22 Jun 2019 15:11:36 -0700 From: Jaegeuk Kim To: Eric Biggers Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, linux-integrity@vger.kernel.org, "Theodore Y . Ts'o" , Victor Hsieh , Chandan Rajendra , Dave Chinner , Christoph Hellwig , "Darrick J . Wong" , Linus Torvalds Subject: Re: [PATCH v5 03/16] fs-verity: add UAPI header Message-ID: <20190622221136.GC19686@jaegeuk-macbookpro.roam.corp.google.com> References: <20190620205043.64350-1-ebiggers@kernel.org> <20190620205043.64350-4-ebiggers@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190620205043.64350-4-ebiggers@kernel.org> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On 06/20, Eric Biggers wrote: > From: Eric Biggers > > Add the UAPI header for fs-verity, including two ioctls: > > - FS_IOC_ENABLE_VERITY > - FS_IOC_MEASURE_VERITY > > These ioctls are documented in the "User API" section of > Documentation/filesystems/fsverity.rst. > > Examples of using these ioctls can be found in fsverity-utils > (https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git). > > I've also written xfstests that test these ioctls > (https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/xfstests-dev.git/log/?h=fsverity). > > Reviewed-by: Theodore Ts'o Reviewed-by: Jaegeuk Kim > Signed-off-by: Eric Biggers > --- > Documentation/ioctl/ioctl-number.txt | 1 + > include/uapi/linux/fsverity.h | 39 ++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+) > create mode 100644 include/uapi/linux/fsverity.h > > diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt > index c9558146ac5896..21767c81e86d58 100644 > --- a/Documentation/ioctl/ioctl-number.txt > +++ b/Documentation/ioctl/ioctl-number.txt > @@ -225,6 +225,7 @@ Code Seq#(hex) Include File Comments > 'f' 00-0F fs/ext4/ext4.h conflict! > 'f' 00-0F linux/fs.h conflict! > 'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! > +'f' 81-8F linux/fsverity.h > 'g' 00-0F linux/usb/gadgetfs.h > 'g' 20-2F linux/usb/g_printer.h > 'h' 00-7F conflict! Charon filesystem > diff --git a/include/uapi/linux/fsverity.h b/include/uapi/linux/fsverity.h > new file mode 100644 > index 00000000000000..57d1d7fc0c345a > --- /dev/null > +++ b/include/uapi/linux/fsverity.h > @@ -0,0 +1,39 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* > + * fs-verity user API > + * > + * These ioctls can be used on filesystems that support fs-verity. See the > + * "User API" section of Documentation/filesystems/fsverity.rst. > + * > + * Copyright 2019 Google LLC > + */ > +#ifndef _UAPI_LINUX_FSVERITY_H > +#define _UAPI_LINUX_FSVERITY_H > + > +#include > +#include > + > +#define FS_VERITY_HASH_ALG_SHA256 1 > + > +struct fsverity_enable_arg { > + __u32 version; > + __u32 hash_algorithm; > + __u32 block_size; > + __u32 salt_size; > + __u64 salt_ptr; > + __u32 sig_size; > + __u32 __reserved1; > + __u64 sig_ptr; > + __u64 __reserved2[11]; > +}; > + > +struct fsverity_digest { > + __u16 digest_algorithm; > + __u16 digest_size; /* input/output */ > + __u8 digest[]; > +}; > + > +#define FS_IOC_ENABLE_VERITY _IOW('f', 133, struct fsverity_enable_arg) > +#define FS_IOC_MEASURE_VERITY _IOWR('f', 134, struct fsverity_digest) > + > +#endif /* _UAPI_LINUX_FSVERITY_H */ > -- > 2.22.0.410.gd8fdbe21b5-goog