diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 19:15:20 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 19:15:20 -0400 |
| commit | fd8d3cd9f27155598a1b927efb48e69670afdb43 (patch) | |
| tree | 57497a17cf187195e9ca6537048537eacc61fe52 | |
| parent | 2744b4024c7fc797d6a53f8b45e0c5dda9c2e209 (diff) | |
| download | longterm-queue-5.2-fd8d3cd9f27155598a1b927efb48e69670afdb43.tar.gz | |
ceph: breaks build on v5.2.x codebase
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ceph-set-sec_context-xattr-on-symlink-creation.patch | 36 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/queue/ceph-set-sec_context-xattr-on-symlink-creation.patch b/queue/ceph-set-sec_context-xattr-on-symlink-creation.patch deleted file mode 100644 index df1f9ac3..00000000 --- a/queue/ceph-set-sec_context-xattr-on-symlink-creation.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b748fc7a8763a5b3f8149f12c45711cd73ef8176 Mon Sep 17 00:00:00 2001 -From: Jeff Layton <jlayton@kernel.org> -Date: Tue, 28 Jul 2020 10:34:20 -0400 -Subject: [PATCH] ceph: set sec_context xattr on symlink creation - -commit b748fc7a8763a5b3f8149f12c45711cd73ef8176 upstream. - -Symlink inodes should have the security context set in their xattrs on -creation. We already set the context on creation, but we don't attach -the pagelist. The effect is that symlink inodes don't get an SELinux -context set on them at creation, so they end up unlabeled instead of -inheriting the proper context. Make it do so. - -Cc: stable@vger.kernel.org -Signed-off-by: Jeff Layton <jlayton@kernel.org> -Reviewed-by: Ilya Dryomov <idryomov@gmail.com> -Signed-off-by: Ilya Dryomov <idryomov@gmail.com> - -diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c -index 39f5311404b0..060bdcc5ce32 100644 ---- a/fs/ceph/dir.c -+++ b/fs/ceph/dir.c -@@ -930,6 +930,10 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry, - req->r_num_caps = 2; - req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL; - req->r_dentry_unless = CEPH_CAP_FILE_EXCL; -+ if (as_ctx.pagelist) { -+ req->r_pagelist = as_ctx.pagelist; -+ as_ctx.pagelist = NULL; -+ } - err = ceph_mdsc_do_request(mdsc, dir, req); - if (!err && !req->r_reply_info.head->is_dentry) - err = ceph_handle_notrace_create(dir, dentry); --- -2.27.0 - diff --git a/queue/series b/queue/series index 2fb7b6bd..fbb8cae9 100644 --- a/queue/series +++ b/queue/series @@ -41,7 +41,6 @@ tracing-Use-trace_sched_process_free-instead-of-exit.patch watchdog-f71808e_wdt-indicate-WDIOF_CARDRESET-suppor.patch watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_in.patch watchdog-f71808e_wdt-clear-watchdog-timeout-occurred.patch -ceph-set-sec_context-xattr-on-symlink-creation.patch pseries-Fix-64-bit-logical-memory-block-panic.patch perf-intel-pt-Fix-FUP-packet-state.patch remoteproc-qcom-q6v5-Update-running-state-before-req.patch |