Message ID | 20171023214058.128121-15-ebiggers3@gmail.com |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gmuaEK/F"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VGPzTcZo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yLVNm657Nz9sPr for <incoming@patchwork.ozlabs.org>; Tue, 24 Oct 2017 08:47:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=SCMfLLKj8CuDz8ZxhpJoP4opxRSTaU26l/RkoTtptmg=; b=gmuaEK/F6Sfu/VHVq4XYWunasA NGiMs7AvQz9KY4DAsZPyq6xEGNPU0aCJYVquaUfC5TblqDG5SmtYFN/yUtMIvx0AGRIIFj203wRMc l4RZMr1wdKZ/q3LxhwdVq+WclHRqcjJdih72Dizxw7pqH7e6lw/mwTGYEfp3GHlNkscQohiS7MDy/ ybw9nwhrDVE8X6AgUGWroYpdncXWsTgcJH1SGs66dZSp+CQDOXuSXGIEgUkbbAOovlcKiDLrXU93j +JyyGs0Fn5unmGIIkYYKEb99EMZ9Ug46hVGii3bNcej4qwo4MiRYYk7ByOfSjVvXfjnw5EyDQC0X/ OrirfI4Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e6kYm-00018o-Uh; Mon, 23 Oct 2017 21:47:00 +0000 Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kUh-0004gy-QB for linux-mtd@lists.infradead.org; Mon, 23 Oct 2017 21:43:02 +0000 Received: by mail-io0-x244.google.com with SMTP id p186so21681265ioe.12 for <linux-mtd@lists.infradead.org>; Mon, 23 Oct 2017 14:42:28 -0700 (PDT) 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=QUfHkpecBlLdLVUNqn67/PgAG+kEvbbZIrssE94eL6s=; b=VGPzTcZoDtmaIFyxFbGwrU4iDmMt8zk9KIp/BkYfI2I1WlPPXuortAGSY7LHBncdDv MXUnYnZNttnx3vDNNeO4GadXZrCPnlic/+t3FticaJ6bZHnjYAADoRVGExyhNzsaDc89 iIMxM9jb7zBgdVo4jK/F/lo5N1ds1J9tey1QC+s64HkjFmdCjC1EH2fTZISR01ssHaiT WgzkEKoEj1LSFHbepybfb3EEqD5MaNr0pG/PWtziFox1mqqwo8Kw2RG/zOuv2rdmto8u 5qCi4lXRJWLWrOZOryurd/zFg2EBZwY0tSqsGSSJSggpUH3KvIdElAww8+GnSWD+W/D2 JBlQ== 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=QUfHkpecBlLdLVUNqn67/PgAG+kEvbbZIrssE94eL6s=; b=gwZUQVN9YunKm39kG9cg46hcHdFvSaAbIdltzzAj1pXo0yroS0QSxiD5Tbf6vWjD/h Sf9/asyMp0FRb/HA8ZyDz5diJFkOqOjzBkzr4rOj8Nzw+aRnl8O22GWC4PMnM9R+SSUS H3Z8MaPEcuk2u9RFptp80xVzwcgpV67s4zTVg06q1mPK4VJXqnWfmAgdLvHsvcSO9WJf Tnj++nCpPmbI5FW8Yh8gp9Uii/b+nGI31sUxJXZ5o/g4yFA3jPS6kuF7Qpsko8in4cYo 6Fwvg2XIEn4JNqimYNj63jKbuSFWkGFid37aVqTua8z16FeVw0oAQPpQAWCDip8A4wBc geUw== X-Gm-Message-State: AMCzsaWJ+grM7ZhJkqP0vkyJCQY2SAZhi6uzhzSITw2JFryWgw7+JUET cBco44QxjJ3NT9IDaZWcTgY= X-Google-Smtp-Source: ABhQp+TPuEafxtwHdHrn3WFN7nQ7gLOS4bDqSLYIa6OozxpNhD68RV709wXkOz9M6Nd1cbtE9tr8jQ== X-Received: by 10.107.192.71 with SMTP id q68mr6542203iof.81.1508794947960; Mon, 23 Oct 2017 14:42:27 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.175.88]) by smtp.gmail.com with ESMTPSA id i63sm3558482ioi.68.2017.10.23.14.42.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:27 -0700 (PDT) From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 14/25] ubifs crypto: wire up new ioctls for managing encryption keys Date: Mon, 23 Oct 2017 14:40:47 -0700 Message-Id: <20171023214058.128121-15-ebiggers3@gmail.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171023214058.128121-1-ebiggers3@gmail.com> References: <20171023214058.128121-1-ebiggers3@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171023_144248_256223_BDB78C1E X-CRM114-Status: UNSURE ( 8.12 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ebiggers3[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: Ryo Hashimoto <hashimoto@chromium.org>, Gwendal Grignou <gwendal@chromium.org>, "Theodore Y . Ts'o" <tytso@mit.edu>, Eric Biggers <ebiggers@google.com>, linux-api@vger.kernel.org, Nick Desaulniers <ndesaulniers@google.com>, linux-f2fs-devel@lists.sourceforge.net, keyrings@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Halcrow <mhalcrow@google.com>, Sarthak Kukreti <sarthakkukreti@chromium.org>, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
fscrypt: filesystem-level keyring and v2 policy support
|
expand
|
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 0164bcc827f8..09ede2d1898f 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -205,6 +205,15 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) #endif } + case FS_IOC_ADD_ENCRYPTION_KEY: + return fscrypt_ioctl_add_key(file, (void __user *)arg); + + case FS_IOC_REMOVE_ENCRYPTION_KEY: + return fscrypt_ioctl_remove_key(file, (const void __user *)arg); + + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: + return fscrypt_ioctl_get_key_status(file, (void __user *)arg); + default: return -ENOTTY; } @@ -222,6 +231,9 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case FS_IOC_SET_ENCRYPTION_POLICY: case FS_IOC_GET_ENCRYPTION_POLICY: + case FS_IOC_ADD_ENCRYPTION_KEY: + case FS_IOC_REMOVE_ENCRYPTION_KEY: + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: break; default: return -ENOIOCTLCMD;