mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-23.2
* sm8350/lineage-20: UPSTREAM: tty: allow TIOCSLCKTRMIOS with CAP_CHECKPOINT_RESTORE UPSTREAM: selftests: add clone3() CAP_CHECKPOINT_RESTORE test UPSTREAM: prctl: exe link permission error changed from -EINVAL to -EPERM UPSTREAM: prctl: Allow local CAP_CHECKPOINT_RESTORE to change /proc/self/exe UPSTREAM: proc: allow access in init userns for map_files with CAP_CHECKPOINT_RESTORE UPSTREAM: pid_namespace: use checkpoint_restore_ns_capable() for ns_last_pid UPSTREAM: pid: use checkpoint_restore_ns_capable() for set_tid UPSTREAM: capabilities: Introduce CAP_CHECKPOINT_RESTORE UPSTREAM: selftests: add tests for clone3() with *set_tid UPSTREAM: fork: extend clone3() to support setting a PID UPSTREAM: selftests: add tests for clone3() UPSTREAM: tests: test CLONE_CLEAR_SIGHAND UPSTREAM: clone3: add CLONE_CLEAR_SIGHAND Change-Id: I7890fb550e85b9fd4c0c3a27144d5bfd8963d496
This commit is contained in:
commit
5048089773
22 changed files with 1139 additions and 61 deletions
|
|
@ -807,7 +807,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
|
|||
ret = -EFAULT;
|
||||
return ret;
|
||||
case TIOCSLCKTRMIOS:
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
if (!checkpoint_restore_ns_capable(&init_user_ns))
|
||||
return -EPERM;
|
||||
copy_termios_locked(real_tty, &kterm);
|
||||
if (user_termios_to_kernel_termios(&kterm,
|
||||
|
|
@ -824,7 +824,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
|
|||
ret = -EFAULT;
|
||||
return ret;
|
||||
case TIOCSLCKTRMIOS:
|
||||
if (!capable(CAP_SYS_ADMIN))
|
||||
if (!checkpoint_restore_ns_capable(&init_user_ns))
|
||||
return -EPERM;
|
||||
copy_termios_locked(real_tty, &kterm);
|
||||
if (user_termios_to_kernel_termios_1(&kterm,
|
||||
|
|
|
|||
Loading…
Reference in a new issue