From patchwork Thu Nov 17 14:23:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 1705119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=He+rjTEr; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NChxX46Kjz23mx for ; Fri, 18 Nov 2022 01:24:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ovfoG-0007Bv-Me; Thu, 17 Nov 2022 14:24:08 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ovfoE-0007Ab-Hl for kernel-team@lists.ubuntu.com; Thu, 17 Nov 2022 14:24:06 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2827B3F367 for ; Thu, 17 Nov 2022 14:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668695046; bh=nNwYq42m3dfGyeB13XwFGNvaLhMla0zuprAn5VHL41A=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=He+rjTErZ56tlfxB2/bKP1bNTTNQOflsTARLn3gLV4SNDo4OeTAkuLRxTtT0Gxkp0 RptqH21X1rKASAGUE6oXxUimqAmZUIekPzvQ04TF5P2V2tmeLjbfrE9ZhFVi0yB/dp EhfCyU6czVjIhJbsQNuifLpy2BWbWxj7ahKA0JlbRR119luUjRXd4d7f/xqy5iluV5 d6XGUu9/Ww8rZNYcEygkDd8Q0M6vDT8i8qfqCJDzTFesr/vNeVn1BO2PVseLdjXXYg kFuDvOL2qO8D52syzhQJVQ8LepRabrceybb0rLd+luNJO5E5p6sWIJEx0W8c+RSPki RcOPbBumutDCQ== Received: by mail-ed1-f71.google.com with SMTP id v18-20020a056402349200b004622e273bbbso1313995edc.14 for ; Thu, 17 Nov 2022 06:24:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nNwYq42m3dfGyeB13XwFGNvaLhMla0zuprAn5VHL41A=; b=3l+BHqj6GLzR15DvGwMZkJWo6XIG4FDiYHVnAYDNSQnQ7M7yMGCsgGfsxMWnSVnqR7 TRWfHEoSzMfUQ9GxVFijEJfKun6qxjViJMibiJQlFgl2moBtKX6m4DmPrYsaOHijYlXI xnA/zxdOIt7NeSMBt3c4VX9+DSdYkEjP3sa+nT3XojyxrF5mSqQdlWy0LCLJGBMeUgbP veAIFCETnxZyZWI2Nn2u/6lS70t5FtGWkhmntVAQiqMBGTvnbN0rf15wADdRzCgzkylT C5YCA3D6QnZJvUzi1NqHw/K3EAcqw64HHKf4wTvOrsHQiLH+iZo24zsN17ZGnZycjGNw mWqQ== X-Gm-Message-State: ANoB5pl9Qd/GJss8UKVx8kM62WDZIxUQoFn4oWeRWqCzNvVt6xeF/9a5 JwdPBsoEgGLhVuWo19TqFWk5ZNRALUjMnzyYx4gOTo8pgTsyrLtrLFri1+M90tlljv9652IGHqU tpd6icMzC898A8YtfLkLu6F+I24q994PykOBgvKvTcw== X-Received: by 2002:a17:906:77d0:b0:7ae:1826:b27b with SMTP id m16-20020a17090677d000b007ae1826b27bmr2165928ejn.692.1668695042824; Thu, 17 Nov 2022 06:24:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf57pUoP5OxkqOQY/vtADZVU4QKyeqz83yGSZyQoTIb7oKGW+5Y2PobIDy8KFNenUcfJVVM1ZQ== X-Received: by 2002:a17:906:77d0:b0:7ae:1826:b27b with SMTP id m16-20020a17090677d000b007ae1826b27bmr2165904ejn.692.1668695042538; Thu, 17 Nov 2022 06:24:02 -0800 (PST) Received: from amikhalitsyn.. (ip4d177669.dynamic.kabel-deutschland.de. [77.23.118.105]) by smtp.gmail.com with ESMTPSA id qk14-20020a170906d9ce00b00772061034dbsm417382ejb.182.2022.11.17.06.24.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 06:24:02 -0800 (PST) From: Alexander Mikhalitsyn To: kernel-team@lists.ubuntu.com Subject: [SRU][J/K][PATCH] UBUNTU: [SAUCE] shiftfs: fix permanent -EOVERFLOW inside the CT Date: Thu, 17 Nov 2022 15:23:47 +0100 Message-Id: <20221117142347.412558-1-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1990849 We haven't supported idmapped layers with shiftfs and moreover, that makes no sense. Once lower fs support idmapped mounts when shiftfs is not needed. Starting from linux-image-5.15.0-48-generic users started seeing EOVERFLOW errors from the userspace side on a trivial fs operations inside the containers. This is caused by patches ("fs: tweak fsuidgid_has_mapping()"), ("fs: support mapped mounts of mapped filesystems"). These patches extends and enables idmapped mounts support in Ubuntu kernel, but the problem is that shiftfs was not properly ported. See also: ("namei: prepare for idmapped mounts") https://lore.kernel.org/all/20210121131959.646623-15-christian.brauner@ubuntu.com/ ("overlayfs: do not mount on top of idmapped mounts") https://lore.kernel.org/all/20210121131959.646623-29-christian.brauner@ubuntu.com/ as a reference. Fixes: d347e71d2c0 ("UBUNTU: [SAUCE] shiftfs: support kernel 5.15") Reported-by: Thomas Parrott Signed-off-by: Alexander Mikhalitsyn --- fs/shiftfs.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/fs/shiftfs.c b/fs/shiftfs.c index 76c54bc12018..9ea6e7ef06f9 100644 --- a/fs/shiftfs.c +++ b/fs/shiftfs.c @@ -379,8 +379,8 @@ static int shiftfs_xattr_set(const struct xattr_handler *handler, int flags) { if (!value) - return shiftfs_removexattr(ns, dentry, name); - return shiftfs_setxattr(ns, dentry, inode, name, value, size, flags); + return shiftfs_removexattr(&init_user_ns, dentry, name); + return shiftfs_setxattr(&init_user_ns, dentry, inode, name, value, size, flags); } static int shiftfs_inode_test(struct inode *inode, void *data) @@ -545,7 +545,7 @@ static int shiftfs_create(struct user_namespace *ns, { mode |= S_IFREG; - return shiftfs_create_object(ns, dir, dentry, mode, NULL, NULL, excl); + return shiftfs_create_object(&init_user_ns, dir, dentry, mode, NULL, NULL, excl); } static int shiftfs_mkdir(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, @@ -553,7 +553,7 @@ static int shiftfs_mkdir(struct user_namespace *ns, struct inode *dir, struct de { mode |= S_IFDIR; - return shiftfs_create_object(ns, dir, dentry, mode, NULL, NULL, false); + return shiftfs_create_object(&init_user_ns, dir, dentry, mode, NULL, NULL, false); } static int shiftfs_link(struct dentry *hardlink, struct inode *dir, @@ -569,13 +569,13 @@ static int shiftfs_mknod(struct user_namespace *ns, if (!S_ISFIFO(mode) && !S_ISSOCK(mode)) return -EPERM; - return shiftfs_create_object(ns, dir, dentry, mode, NULL, NULL, false); + return shiftfs_create_object(&init_user_ns, dir, dentry, mode, NULL, NULL, false); } static int shiftfs_symlink(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, const char *symlink) { - return shiftfs_create_object(ns, dir, dentry, S_IFLNK, symlink, NULL, false); + return shiftfs_create_object(&init_user_ns, dir, dentry, S_IFLNK, symlink, NULL, false); } static int shiftfs_rm(struct inode *dir, struct dentry *dentry, bool rmdir) @@ -633,10 +633,10 @@ static int shiftfs_rename(struct user_namespace *ns, struct inode *loweri_dir_old = lowerd_dir_old->d_inode, *loweri_dir_new = lowerd_dir_new->d_inode; struct renamedata rd = { - .old_mnt_userns = ns, + .old_mnt_userns = &init_user_ns, .old_dir = loweri_dir_old, .old_dentry = lowerd_old, - .new_mnt_userns = ns, + .new_mnt_userns = &init_user_ns, .new_dir = loweri_dir_new, .new_dentry = lowerd_new, }; @@ -716,12 +716,12 @@ static int shiftfs_permission(struct user_namespace *ns, struct inode *inode, in return -ECHILD; } - err = generic_permission(ns, inode, mask); + err = generic_permission(&init_user_ns, inode, mask); if (err) return err; oldcred = shiftfs_override_creds(inode->i_sb); - err = inode_permission(ns, loweri, mask); + err = inode_permission(&init_user_ns, loweri, mask); revert_creds(oldcred); return err; @@ -760,7 +760,7 @@ static int shiftfs_tmpfile(struct user_namespace *ns, return -EOPNOTSUPP; oldcred = shiftfs_override_creds(dir->i_sb); - err = loweri->i_op->tmpfile(ns, loweri, lowerd, mode); + err = loweri->i_op->tmpfile(&init_user_ns, loweri, lowerd, mode); revert_creds(oldcred); return err; @@ -776,7 +776,7 @@ static int shiftfs_setattr(struct user_namespace *ns, struct dentry *dentry, str struct shiftfs_super_info *sbinfo = sb->s_fs_info; int err; - err = setattr_prepare(ns, dentry, attr); + err = setattr_prepare(&init_user_ns, dentry, attr); if (err) return err; @@ -793,7 +793,7 @@ static int shiftfs_setattr(struct user_namespace *ns, struct dentry *dentry, str inode_lock(loweri); oldcred = shiftfs_override_creds(dentry->d_sb); - err = notify_change(ns, lowerd, &newattr, NULL); + err = notify_change(&init_user_ns, lowerd, &newattr, NULL); revert_creds(oldcred); inode_unlock(loweri); @@ -973,17 +973,17 @@ shiftfs_posix_acl_xattr_set(const struct xattr_handler *handler, return -EOPNOTSUPP; if (handler->flags == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode)) return value ? -EACCES : 0; - if (!inode_owner_or_capable(ns, inode)) + if (!inode_owner_or_capable(&init_user_ns, inode)) return -EPERM; if (value) { shift_acl_xattr_ids(inode->i_sb->s_user_ns, loweri->i_sb->s_user_ns, (void *)value, size); - err = shiftfs_setxattr(ns, dentry, inode, handler->name, value, + err = shiftfs_setxattr(&init_user_ns, dentry, inode, handler->name, value, size, flags); } else { - err = shiftfs_removexattr(ns, dentry, handler->name); + err = shiftfs_removexattr(&init_user_ns, dentry, handler->name); } if (!err) @@ -2017,6 +2017,16 @@ static int shiftfs_fill_super(struct super_block *sb, void *raw_data, goto out_put_path; } + /* + * It makes no sense to handle idmapped layers from shiftfs. + * And we didn't support it properly anyway. + */ + if (is_idmapped_mnt(path.mnt)) { + err = -EINVAL; + pr_err("idmapped layers are currently not supported\n"); + goto out_put_path; + } + sb->s_flags |= SB_POSIXACL; if (sbinfo->mark) {