mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-29 04:09:39 +00:00
f9b4240b07
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCX9daOgAKCRCRxhvAZXjc
ohPkAQChXUB2BAjtIzXlCkZoDBbzHHblm5DZ37oy/4xYFmAcEwEA5sw6dQqyGHnF
GEP9def51HvXLpBV2BzNUGggo1SoGgQ=
=w/cO
-----END PGP SIGNATURE-----
Merge tag 'fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux
Pull misc fixes from Christian Brauner:
"This contains several fixes which felt worth being combined into a
single branch:
- Use put_nsproxy() instead of open-coding it switch_task_namespaces()
- Kirill's work to unify lifecycle management for all namespaces. The
lifetime counters are used identically for all namespaces types.
Namespaces may of course have additional unrelated counters and
these are not altered. This work allows us to unify the type of the
counters and reduces maintenance cost by moving the counter in one
place and indicating that basic lifetime management is identical
for all namespaces.
- Peilin's fix adding three byte padding to Dmitry's
PTRACE_GET_SYSCALL_INFO uapi struct to prevent an info leak.
- Two smal patches to convert from the /* fall through */ comment
annotation to the fallthrough keyword annotation which I had taken
into my branch and into -next before df561f6688 ("treewide: Use
fallthrough pseudo-keyword") made it upstream which fixed this
tree-wide.
Since I didn't want to invalidate all testing for other commits I
didn't rebase and kept them"
* tag 'fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
nsproxy: use put_nsproxy() in switch_task_namespaces()
sys: Convert to the new fallthrough notation
signal: Convert to the new fallthrough notation
time: Use generic ns_common::count
cgroup: Use generic ns_common::count
mnt: Use generic ns_common::count
user: Use generic ns_common::count
pid: Use generic ns_common::count
ipc: Use generic ns_common::count
uts: Use generic ns_common::count
net: Use generic ns_common::count
ns: Add a common refcount into ns_common
ptrace: Prevent kernel-infoleak in ptrace_get_syscall_info()
160 lines
3.8 KiB
C
160 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LINUX_TIMENS_H
|
|
#define _LINUX_TIMENS_H
|
|
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/ns_common.h>
|
|
#include <linux/err.h>
|
|
|
|
struct user_namespace;
|
|
extern struct user_namespace init_user_ns;
|
|
|
|
struct timens_offsets {
|
|
struct timespec64 monotonic;
|
|
struct timespec64 boottime;
|
|
};
|
|
|
|
struct time_namespace {
|
|
struct user_namespace *user_ns;
|
|
struct ucounts *ucounts;
|
|
struct ns_common ns;
|
|
struct timens_offsets offsets;
|
|
struct page *vvar_page;
|
|
/* If set prevents changing offsets after any task joined namespace. */
|
|
bool frozen_offsets;
|
|
} __randomize_layout;
|
|
|
|
extern struct time_namespace init_time_ns;
|
|
|
|
#ifdef CONFIG_TIME_NS
|
|
extern int vdso_join_timens(struct task_struct *task,
|
|
struct time_namespace *ns);
|
|
extern void timens_commit(struct task_struct *tsk, struct time_namespace *ns);
|
|
|
|
static inline struct time_namespace *get_time_ns(struct time_namespace *ns)
|
|
{
|
|
refcount_inc(&ns->ns.count);
|
|
return ns;
|
|
}
|
|
|
|
struct time_namespace *copy_time_ns(unsigned long flags,
|
|
struct user_namespace *user_ns,
|
|
struct time_namespace *old_ns);
|
|
void free_time_ns(struct time_namespace *ns);
|
|
void timens_on_fork(struct nsproxy *nsproxy, struct task_struct *tsk);
|
|
struct vdso_data *arch_get_vdso_data(void *vvar_page);
|
|
|
|
static inline void put_time_ns(struct time_namespace *ns)
|
|
{
|
|
if (refcount_dec_and_test(&ns->ns.count))
|
|
free_time_ns(ns);
|
|
}
|
|
|
|
void proc_timens_show_offsets(struct task_struct *p, struct seq_file *m);
|
|
|
|
struct proc_timens_offset {
|
|
int clockid;
|
|
struct timespec64 val;
|
|
};
|
|
|
|
int proc_timens_set_offset(struct file *file, struct task_struct *p,
|
|
struct proc_timens_offset *offsets, int n);
|
|
|
|
static inline void timens_add_monotonic(struct timespec64 *ts)
|
|
{
|
|
struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets;
|
|
|
|
*ts = timespec64_add(*ts, ns_offsets->monotonic);
|
|
}
|
|
|
|
static inline void timens_add_boottime(struct timespec64 *ts)
|
|
{
|
|
struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets;
|
|
|
|
*ts = timespec64_add(*ts, ns_offsets->boottime);
|
|
}
|
|
|
|
static inline u64 timens_add_boottime_ns(u64 nsec)
|
|
{
|
|
struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets;
|
|
|
|
return nsec + timespec64_to_ns(&ns_offsets->boottime);
|
|
}
|
|
|
|
static inline void timens_sub_boottime(struct timespec64 *ts)
|
|
{
|
|
struct timens_offsets *ns_offsets = ¤t->nsproxy->time_ns->offsets;
|
|
|
|
*ts = timespec64_sub(*ts, ns_offsets->boottime);
|
|
}
|
|
|
|
ktime_t do_timens_ktime_to_host(clockid_t clockid, ktime_t tim,
|
|
struct timens_offsets *offsets);
|
|
|
|
static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim)
|
|
{
|
|
struct time_namespace *ns = current->nsproxy->time_ns;
|
|
|
|
if (likely(ns == &init_time_ns))
|
|
return tim;
|
|
|
|
return do_timens_ktime_to_host(clockid, tim, &ns->offsets);
|
|
}
|
|
|
|
#else
|
|
static inline int vdso_join_timens(struct task_struct *task,
|
|
struct time_namespace *ns)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void timens_commit(struct task_struct *tsk,
|
|
struct time_namespace *ns)
|
|
{
|
|
}
|
|
|
|
static inline struct time_namespace *get_time_ns(struct time_namespace *ns)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void put_time_ns(struct time_namespace *ns)
|
|
{
|
|
}
|
|
|
|
static inline
|
|
struct time_namespace *copy_time_ns(unsigned long flags,
|
|
struct user_namespace *user_ns,
|
|
struct time_namespace *old_ns)
|
|
{
|
|
if (flags & CLONE_NEWTIME)
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
return old_ns;
|
|
}
|
|
|
|
static inline void timens_on_fork(struct nsproxy *nsproxy,
|
|
struct task_struct *tsk)
|
|
{
|
|
return;
|
|
}
|
|
|
|
static inline void timens_add_monotonic(struct timespec64 *ts) { }
|
|
static inline void timens_add_boottime(struct timespec64 *ts) { }
|
|
|
|
static inline u64 timens_add_boottime_ns(u64 nsec)
|
|
{
|
|
return nsec;
|
|
}
|
|
|
|
static inline void timens_sub_boottime(struct timespec64 *ts) { }
|
|
|
|
static inline ktime_t timens_ktime_to_host(clockid_t clockid, ktime_t tim)
|
|
{
|
|
return tim;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _LINUX_TIMENS_H */
|