ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'topic/kcmp-kconfig-2021-02-22' of git://anongit.freedesktop.org/drm/drm

Browse Source 
Pull kcmp kconfig update from Daniel Vetter:
 "Make the kcmp syscall available independently of checkpoint/restore.

  drm userspaces uses this, systemd uses this, so makes sense to pull it
  out from the checkpoint-restore bundle.

  Kees reviewed this from security pov and is happy with the final
  version"

Link: https://lwn.net/Articles/845448/

* tag 'topic/kcmp-kconfig-2021-02-22' of git://anongit.freedesktop.org/drm/drm:
  kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE
This commit is contained in:
Linus Torvalds
2021-02-22 17:15:30 -08:00
parent 7b0b78df9c bfe3911a91
commit 4b5f9254e4
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/Kconfig
View File

@@ -15,6 +15,9 @@ menuconfig DRM
select I2C_ALGOBIT select I2C_ALGOBIT
select DMA_SHARED_BUFFER select DMA_SHARED_BUFFER
select SYNC_FILE select SYNC_FILE
# gallium uses SYS_kcmp for os_same_file_description() to de-duplicate
# device and dmabuf fd. Let's make sure that is available for our userspace.
select KCMP
help help
Kernel-level support for the Direct Rendering Infrastructure (DRI) Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select introduced in XFree86 4.0. If you say Y here, you need to select

4
fs/eventpoll.c
View File

@@ -979,7 +979,7 @@ static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd)
return epir; return epir;
} }
#ifdef CONFIG_CHECKPOINT_RESTORE #ifdef CONFIG_KCMP
static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff) static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff)
{ {
struct rb_node *rbp; struct rb_node *rbp;
@@ -1021,7 +1021,7 @@ struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd,
return file_raw; return file_raw;
} }
#endif /* CONFIG_CHECKPOINT_RESTORE */ #endif /* CONFIG_KCMP */
/** /**
* Adds a new entry to the tail of the list in a lockless way, i.e. * Adds a new entry to the tail of the list in a lockless way, i.e.

2
include/linux/eventpoll.h
View File

@@ -18,7 +18,7 @@ struct file;
#ifdef CONFIG_EPOLL #ifdef CONFIG_EPOLL
#ifdef CONFIG_CHECKPOINT_RESTORE #ifdef CONFIG_KCMP
struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff); struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff);
#endif #endif

11
init/Kconfig
View File

@@ -1193,6 +1193,7 @@ endif # NAMESPACES
config CHECKPOINT_RESTORE config CHECKPOINT_RESTORE
bool "Checkpoint/restore support" bool "Checkpoint/restore support"
select PROC_CHILDREN select PROC_CHILDREN
select KCMP
default n default n
help help
Enables additional kernel features in a sake of checkpoint/restore. Enables additional kernel features in a sake of checkpoint/restore.
@@ -1736,6 +1737,16 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS
config ARCH_HAS_MEMBARRIER_SYNC_CORE config ARCH_HAS_MEMBARRIER_SYNC_CORE
bool bool
config KCMP
bool "Enable kcmp() system call" if EXPERT
help
Enable the kernel resource comparison system call. It provides
user-space with the ability to compare two processes to see if they
share a common resource, such as a file descriptor or even virtual
memory space.
If unsure, say N.
config RSEQ config RSEQ
bool "Enable rseq() system call" if EXPERT bool "Enable rseq() system call" if EXPERT
default y default y

2
kernel/Makefile
View File

@@ -51,7 +51,7 @@ obj-y += livepatch/
obj-y += dma/ obj-y += dma/
obj-y += entry/ obj-y += entry/
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_KCMP) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_STACKTRACE) += stacktrace.o

2
tools/testing/selftests/seccomp/seccomp_bpf.c
View File

@@ -315,7 +315,7 @@ TEST(kcmp)
ret = __filecmp(getpid(), getpid(), 1, 1); ret = __filecmp(getpid(), getpid(), 1, 1);
EXPECT_EQ(ret, 0); EXPECT_EQ(ret, 0);
if (ret != 0 && errno == ENOSYS) if (ret != 0 && errno == ENOSYS)
SKIP(return, "Kernel does not support kcmp() (missing CONFIG_CHECKPOINT_RESTORE?)"); SKIP(return, "Kernel does not support kcmp() (missing CONFIG_KCMP?)");
} }
TEST(mode_strict_support) TEST(mode_strict_support)