~kamalmostafa/ubuntu/+source/linux/+git/wily:master

Last commit made on 2016-02-19
Get this branch:
git clone -b master https://git.launchpad.net/~kamalmostafa/ubuntu/+source/linux/+git/wily
Only Kamal Mostafa can upload to this branch. If you are Kamal Mostafa please log in for upload directions.

Branch merges

Branch information

Recent commits

61f14f6... by Luis Henriques

UBUNTU: Ubuntu-4.2.0-30.35

Signed-off-by: Luis Henriques <email address hidden>

fb895ba... by Seth Forshee

UBUNTU: SAUCE: overlayfs: Propogate nosuid from lower and upper mounts

An overlayfs mount using an upper or lower directory from a
nosuid filesystem bypasses this restriction. Change this so
that if any lower or upper directory is nosuid at mount time the
overlayfs superblock is marked nosuid. This requires some
additions at the vfs level since nosuid currently only applies to
mounts, so a SB_I_NOSUID flag is added along with a helper
function to check a path for nosuid in both the mount and the
superblock.

BugLink: http://bugs.launchpad.net/bugs/1534961
BugLink: http://bugs.launchpad.net/bugs/1535150
Signed-off-by: Seth Forshee <email address hidden>
CVE-2016-1575 CVE-2016-1576
Signed-off-by: Luis Henriques <email address hidden>

d9d1111... by Seth Forshee

UBUNTU: SAUCE: overlayfs: Be more careful about copying up sxid files

When an overlayfs filesystem's lowerdir is on a nosuid filesystem
but the upperdir is not, it's possible to copy up an sxid file or
stick directory into upperdir without changing the mode by
opening the file rw in the overlayfs mount without writing to it.
This makes it possible to bypass the nosuid restriction on the
lowerdir mount.

It's a bad idea in general to let the mounter copy up a sxid file
if the mounter wouldn't have had permission to create the sxid
file in the first place. Therefore change ovl_set_xattr to
exclude these bits when initially setting the mode, then set the
full mode after setting the user for the inode. This allows copy
up for non-sxid files to work as before but causes copy up to
fail for the cases where the user could not have created the sxid
inode in upperdir.

BugLink: http://bugs.launchpad.net/bugs/1534961
BugLink: http://bugs.launchpad.net/bugs/1535150
Signed-off-by: Seth Forshee <email address hidden>
CVE-2016-1575 CVE-2016-1576
Signed-off-by: Luis Henriques <email address hidden>

2d41902... by Seth Forshee

UBUNTU: SAUCE: overlayfs: Skip permission checking for trusted.overlayfs.* xattrs

The original mounter had CAP_SYS_ADMIN in the user namespace
where the mount happened, and the vfs has validated that the user
has permission to do the requested operation. This is sufficient
for allowing the kernel to write these specific xattrs, so bypass
the permission checks for these xattrs.

BugLink: http://bugs.launchpad.net/bugs/1531747
BugLink: http://bugs.launchpad.net/bugs/1534961
BugLink: http://bugs.launchpad.net/bugs/1535150
Signed-off-by: Seth Forshee <email address hidden>
CVE-2016-1575 CVE-2016-1576
Signed-off-by: Luis Henriques <email address hidden>

9b7d5f3... by Seth Forshee

UBUNTU: SAUCE: overlayfs: Use mounter's credentials instead of selectively raising caps

When overlayfs needs to perform internal operations which require
privileges the current user may not have, it does so by
selectively raising the required capabilities in the current set
of credentials. If the current process is in a user namespace
this doesn't always work, as operations such as setting
privileged xattrs often requires privileges in init_user_ns.

These operations really ought to be permitted, based on a couple
of facts:

 1. The vfs has already verified that the current process is
    allowed to perform the requested operation on the overlayfs
    super block, and overlayfs has verified that the operation is
    permitted in upperdir.

 2. The original mounter of the overlayfs super block was
    privileged enough to perform the internal overlayfs
    operations required to satisfy the user's request in
    upperdir.

On the other hand, if the filesystem is mounted from a user
namespace and then accessed in init_user_ns the credentials taken
will exceed those of the mounter. This could result in performing
operations that the user could not do otherwise, such as creating
files which are sxid for another user or group. Both of these
issues can be prevented by using the mounter's credentials when
performing privileged overlayfs-internal operations.

Add a new internal interface, ovl_prepare_creds(), which returns
a new set of credentials for performing privileged internal
operations that is identical to the mounter's creds. Use this
internal interface instead of using prepare_creds() and
selectively raising the needed capabilities.

BugLink: http://bugs.launchpad.net/bugs/1531747
BugLink: http://bugs.launchpad.net/bugs/1534961
BugLink: http://bugs.launchpad.net/bugs/1535150
Signed-off-by: Seth Forshee <email address hidden>
CVE-2016-1575 CVE-2016-1576
Signed-off-by: Luis Henriques <email address hidden>

20ba97e... by Seth Forshee

UBUNTU: SAUCE: cred: Add clone_cred() interface

This interface returns a new set of credentials which is an exact
copy of another set. Also update prepare_kernel_cred() to use
this function instead of duplicating code.

BugLink: http://bugs.launchpad.net/bugs/1531747
BugLink: http://bugs.launchpad.net/bugs/1534961
BugLink: http://bugs.launchpad.net/bugs/1535150
Signed-off-by: Seth Forshee <email address hidden>
CVE-2016-1575 CVE-2016-1576
Signed-off-by: Luis Henriques <email address hidden>

7341c16... by Kamal Mostafa

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Kamal Mostafa <email address hidden>

ba445f6... by Luis Henriques

UBUNTU: Ubuntu-4.2.0-29.34

Signed-off-by: Luis Henriques <email address hidden>

c3d2dd4... by Brad Figg

Revert "UBUNTU: SAUCE: apparmor: fix sleep from invalid context"

This reverts commit 0642b8d2a20d829b0ee716e7e39dde0cbb26deeb.

BugLink: http://bugs.launchpad.net/bugs/1542049
Signed-off-by: Brad Figg <email address hidden>

26a432a... by Brad Figg

Revert "af_unix: Revert 'lock_interruptible' in stream receive code"

This reverts commit b7a8f5dfc0e8d39cb0350009d5550defb4840eda.

BugLink: http://bugs.launchpad.net/bugs/1540731
Signed-off-by: Joseph Salisbury <email address hidden>
Signed-off-by: Brad Figg <email address hidden>