From patchwork Wed Oct 18 02:43:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 10013357 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 F1344602B3 for ; Wed, 18 Oct 2017 02:43:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E331528834 for ; Wed, 18 Oct 2017 02:43:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D75E128841; Wed, 18 Oct 2017 02:43:50 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 4FC9028834 for ; Wed, 18 Oct 2017 02:43:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756637AbdJRCnt (ORCPT ); Tue, 17 Oct 2017 22:43:49 -0400 Received: from mail-qt0-f202.google.com ([209.85.216.202]:60972 "EHLO mail-qt0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756569AbdJRCnr (ORCPT ); Tue, 17 Oct 2017 22:43:47 -0400 Received: by mail-qt0-f202.google.com with SMTP id s26so4785062qts.19 for ; Tue, 17 Oct 2017 19:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=EaQTcDlR5zbb2xdH5i9Gw2oEoKOkfrJo+aJ48xAAZys=; b=p2tKaK6eVB0e8PS0rj8kILy9DPxRoJzHBOlDQUDez2BuQHjFXAwduqmSxNdUTaQFK9 xRl0AyPSE/ovXVi7UypBnDD+2l1YFMofGkhPOk2s23Zne8XcVB93Ts05lDWNcf1lIfBO tc4Dj13a4S/y4Z4ewGZySbBCSCOkPpSsxaTH6d03/pOfXtaAYY19/zFTrWDk0f5gZvfN xf+7zs6HfTwkEtOO5PmGLUI3pUaRnU1x2pQsx34Rttw13nNI76KZDLA5tvawH1PaWUub PJkUlPLmwAPpqwPC/1xZftmRIjG9W3+iNyNrOgqABZqRt6+IjPeG0Dj1LGiAvpug5pzl Pm2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=EaQTcDlR5zbb2xdH5i9Gw2oEoKOkfrJo+aJ48xAAZys=; b=CUSeCIuy6wJfYwSf1v2N0EOa6H9gK7rBw0t1GQltzHANvKI0sEYcjUf3BkujJJ31Gs bxDHVpJdXYjw4yyQfDn4wLSNRYQHy94XTrAiylH4grUHbmn9PUwPrCLmtV80pLXZnq84 llJzmICoxGSLvHn47YbxO6cXDC8CcVN0VPMBzalyCFdvFKrmUv2hL64HSpZWVKtL1WgL chY6e9T7XivIlNZivDX3A+zbspoANjTYGdWNpLkGigQV3DRXpX48BYCZnp2Q3jSpXIWI 5LTDKpuBqUQcKTqm3ZzQoVNhP67My1rcHkp+xOX5XwgV3rHHc8LD75UQisV4lB/Sv14H v4dQ== X-Gm-Message-State: AMCzsaU3Ffm8luxXim8U6LGZjuXVOtYvo5Gh+5Cw2PeIlWRsQQJRIvWO v/X08+U8SrkZuM+QOHwkO/i4GrsfnzcSfLXPt4FT19Bc/WRQiHzxg7M3uNrewWiRnMAjNd2qGd5 n775hyBIzwaGl+oBWdL4NIXrog0wi/f/p X-Google-Smtp-Source: ABhQp+SRws8/Y2zBGS/yQA5eGC7qjCZa7KsYzz3UlfsQu3tbGx7g1mRN86K2O5x5JecdE8yB0QOscNprhP+lY2ukLxR0fA== MIME-Version: 1.0 X-Received: by 10.55.73.15 with SMTP id w15mr11852007qka.25.1508294626996; Tue, 17 Oct 2017 19:43:46 -0700 (PDT) Date: Tue, 17 Oct 2017 19:43:42 -0700 Message-Id: <20171018024342.4328-1-mjg59@google.com> X-Mailer: git-send-email 2.15.0.rc1.287.g2b38de12cc-goog Subject: [PATCH] Fix mounting with MS_I_VERSION From: Matthew Garrett To: linux-fsdevel@vger.kernel.org Cc: Matthew Garrett , David Howells , Alexander Viro , stable@vger.kernel.org Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit e462ec50cb5fa ("VFS: Differentiate mount flags (MS_*) from internal superblock flags") reworked the flags that are passed through do mount, and in the process dropped MS_I_VERSION. Confusingly, things continue working if the i_version mount option is used because that's directly passed to ext4 which interprets it, while iversion is turned into MS_I_VERSION and dropped on the floor. This breaks IMA and EVM and my heart. Signed-off-by: Matthew Garrett Cc: David Howells Cc: Alexander Viro Cc: stable@vger.kernel.org --- fs/namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/namespace.c b/fs/namespace.c index 3b601f115b6c..d18deb4c410b 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2825,7 +2825,8 @@ long do_mount(const char *dev_name, const char __user *dir_name, SB_MANDLOCK | SB_DIRSYNC | SB_SILENT | - SB_POSIXACL); + SB_POSIXACL | + SB_I_VERSION); if (flags & MS_REMOUNT) retval = do_remount(&path, flags, sb_flags, mnt_flags,