Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2018-08-04 21:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Sat Aug 4 21:55:02 2018 rev:78 rq:627386 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2018-07-21 10:25:16.266956744 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2018-08-04 21:55:05.177466355 +0200 @@ -1,0 +2,9 @@ +Fri Aug 3 07:57:34 UTC 2018 - [email protected] + +- 0001-utils-add-LXC_PROC_PID_FD_LEN.patch: prerequisite for applying the + next patch +- 0001-lxc-user-nic-verify-file-descriptor-stable-2.0.patch: fix information + leak and possible open() side effects accessible to regular users via + lxc-user-nic (bsc#988348, CVE-2018-6556) + +------------------------------------------------------------------- New: ---- 0001-lxc-user-nic-verify-file-descriptor-stable-2.0.patch 0001-utils-add-LXC_PROC_PID_FD_LEN.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.GyFt7X/_old 2018-08-04 21:55:06.833469445 +0200 +++ /var/tmp/diff_new_pack.GyFt7X/_new 2018-08-04 21:55:06.833469445 +0200 @@ -32,6 +32,8 @@ Source5: openSUSE_apparmor_mount.conf # PATCH-FIX-UPSTREAM: 0001-apparmor-Allow-usr-lib-paths-for-mount-and-pivot_roo.patch (boo#1099239) Patch0: 0001-apparmor-Allow-usr-lib-paths-for-mount-and-pivot_roo.patch +Patch1: 0001-utils-add-LXC_PROC_PID_FD_LEN.patch +Patch2: 0001-lxc-user-nic-verify-file-descriptor-stable-2.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils @@ -101,6 +103,8 @@ %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build chmod 755 configure ++++++ 0001-lxc-user-nic-verify-file-descriptor-stable-2.0.patch ++++++ >From d183654ec1a2cd1149bdb92601ccb7246bddb14e Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Wed, 25 Jul 2018 19:56:54 +0200 Subject: [PATCH] lxc-user-nic: verify file descriptor Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/lxc_user_nic.c | 35 ++++++++++++++++++++++++++++++++--- src/lxc/utils.c | 12 ++++++++++++ src/lxc/utils.h | 5 +++++ 3 files changed, 49 insertions(+), 3 deletions(-) Index: lxc-2.0.9/src/lxc/lxc_user_nic.c =================================================================== --- lxc-2.0.9.orig/src/lxc/lxc_user_nic.c +++ lxc-2.0.9/src/lxc/lxc_user_nic.c @@ -1124,12 +1124,41 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } } else if (request == LXC_USERNIC_DELETE) { - netns_fd = open(args.pid, O_RDONLY); + char opath[LXC_PROC_PID_FD_LEN]; + + /* Open the path with O_PATH which will not trigger an actual + * open(). Don't report an errno to the caller to not leak + * information whether the path exists or not. + * When stracing setuid is stripped so this is not a concern + * either. + */ + netns_fd = open(args.pid, O_PATH | O_CLOEXEC); if (netns_fd < 0) { - usernic_error("Could not open \"%s\": %s\n", args.pid, - strerror(errno)); + usernic_error("Failed to open \"%s\"\n", args.pid); + exit(EXIT_FAILURE); + } + + if (!fhas_fs_type(netns_fd, NSFS_MAGIC)) { + usernic_error("Path \"%s\" does not refer to a network namespace path\n", args.pid); + close(netns_fd); + exit(EXIT_FAILURE); + } + + ret = snprintf(opath, sizeof(opath), "/proc/self/fd/%d", netns_fd); + if (ret < 0 || (size_t)ret >= sizeof(opath)) { + close(netns_fd); + exit(EXIT_FAILURE); + } + + /* Now get an fd that we can use in setns() calls. */ + ret = open(opath, O_RDONLY | O_CLOEXEC); + if (ret < 0) { + usernic_error("Failed to open \"%s\": %s\n", args.pid, strerror(errno)); + close(netns_fd); exit(EXIT_FAILURE); } + close(netns_fd); + netns_fd = ret; } if (!create_db_dir(LXC_USERNIC_DB)) { Index: lxc-2.0.9/src/lxc/utils.c =================================================================== --- lxc-2.0.9.orig/src/lxc/utils.c +++ lxc-2.0.9/src/lxc/utils.c @@ -2377,6 +2377,18 @@ bool has_fs_type(const char *path, fs_ty return has_type; } +bool fhas_fs_type(int fd, fs_type_magic magic_val) +{ + int ret; + struct statfs sb; + + ret = fstatfs(fd, &sb); + if (ret < 0) + return false; + + return is_fs_type(&sb, magic_val); +} + bool lxc_nic_exists(char *nic) { #define __LXC_SYS_CLASS_NET_LEN 15 + IFNAMSIZ + 1 Index: lxc-2.0.9/src/lxc/utils.h =================================================================== --- lxc-2.0.9.orig/src/lxc/utils.h +++ lxc-2.0.9/src/lxc/utils.h @@ -46,6 +46,10 @@ #define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask)) #endif +#ifndef NSFS_MAGIC +#define NSFS_MAGIC 0x6e736673 +#endif + /* Useful macros */ /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */ #define LXC_NUMSTRLEN64 21 @@ -404,6 +408,7 @@ void *must_realloc(void *orig, size_t sz /* __typeof__ should be safe to use with all compilers. */ typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic; extern bool has_fs_type(const char *path, fs_type_magic magic_val); +extern bool fhas_fs_type(int fd, fs_type_magic magic_val); extern bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val); extern bool lxc_nic_exists(char *nic); ++++++ 0001-utils-add-LXC_PROC_PID_FD_LEN.patch ++++++ >From aa769a272f24d34d9190e04b7c6e93a6b8418376 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Fri, 4 May 2018 11:59:11 +0200 Subject: [PATCH] utils: add LXC_PROC_PID_FD_LEN Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/utils.h | 11 +++++++++++ 1 file changed, 11 insertions(+) Index: lxc-2.0.9/src/lxc/utils.h =================================================================== --- lxc-2.0.9.orig/src/lxc/utils.h +++ lxc-2.0.9/src/lxc/utils.h @@ -52,6 +52,18 @@ #define LXC_LINELEN 4096 #define LXC_IDMAPLEN 4096 +/* /proc/ = 6 + * + + * <pid-as-str> = LXC_NUMSTRLEN64 + * + + * /fd/ = 4 + * + + * <fd-as-str> = LXC_NUMSTRLEN64 + * + + * \0 = 1 + */ +#define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1) + /* returns 1 on success, 0 if there were any failures */ extern int lxc_rmdir_onedev(char *path, const char *exclude); extern int get_u16(unsigned short *val, const char *arg, int base);
