Commits · 623aabd5d68d9d7c1ed94da92e70d413815a126a · Kirill Smelkov / linux

29 Feb, 2016 40 commits

UBUNTU: SAUCE: powerpc/eeh: Validate arch in eeh_add_device_early() · 623aabd5

Guilherme G. Piccoli authored Jan 10, 2016

BugLink: http://bugs.launchpad.net/bugs/1486180

Commit 89a51df5 ("powerpc/eeh: Fix crash in eeh_add_device_early() on Cell")
added a check on function eeh_add_device_early(): since in Cell arch eeh_ops
is NULL, that code used to crash on Cell. The commit's approach was validate
if EEH was available by checking the result of function eeh_enabled().

Since the function eeh_add_device_early() is used to perform EEH
initialization in devices added later on the system, like in hotplug/DLPAR
scenarios, we might reach a case in which no PCI devices are present on boot
and so EEH is not initialized. Then, if a device is added via DLPAR for
example, eeh_add_device_early() fails because eeh_enabled() is false.

We can hit a kernel oops on pSeries arch if eeh_add_device_early() fails:
if we have no PCI devices on machine at boot time, and then we add a PCI device
via DLPAR operation, the function query_ddw() triggers the oops on NULL pointer
dereference in the line "cfg_addr = edev->config_addr;". It happens because
config_addr in edev is NULL, since the function eeh_add_device_early() was not
completed successfully.

This patch just changes the way the arch checking is done in function
eeh_add_device_early(): we use no more eeh_enabled(), but instead we check the
running architecture by using the macro machine_is(). If we are running on
pSeries or PowerNV, the EEH mechanism can be enabled; otherwise, we bail out
the function. This way, we don't enable EEH on Cell and we don't hit the oops
on DLPAR either.

Fixes: 89a51df5 ("powerpc/eeh: Fix crash in eeh_add_device_early() on Cell")
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

623aabd5

UBUNTU: Start new release · 2d16a484
Tim Gardner authored Jan 11, 2016
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
2d16a484
UBUNTU: Ubuntu-4.4.0-0.11 · 015b041e
Tim Gardner authored Jan 11, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
015b041e
UBUNTU: [Config] Fix bogus reconstruct script · 7d6a0127
Tim Gardner authored Jan 11, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
7d6a0127
UBUNTU: Start new release · aaaab06f
Tim Gardner authored Jan 11, 2016
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
aaaab06f
UBUNTU: Ubuntu-4.4.0-0.10 · e8c98c4f
Tim Gardner authored Jan 11, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
e8c98c4f
UBUNTU: [Debian] Ignore spl/zfs symlinks · cc878c16
Tim Gardner authored Jan 11, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
cc878c16
UBUNTU: rebase to v4.4 · 83ea35c2
Tim Gardner authored Jan 11, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
83ea35c2

UBUNTU: SAUCE: dmaengine: ioatdma: Squelch framesize warnings · 3d44c935

Tim Gardner authored Jan 08, 2016

  CC [M]  drivers/dma/ioat/prep.o
drivers/dma/ioat/prep.c: In function 'ioat_prep_pqxor':
drivers/dma/ioat/prep.c:682:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }
 ^
drivers/dma/ioat/prep.c: In function 'ioat_prep_pqxor_val':
drivers/dma/ioat/prep.c:714:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=]
 }

gcc version 5.3.1 20151219 (Ubuntu 5.3.1-4ubuntu1)

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Nicholas Mc Guire <der.herr@hofr.at>
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

3d44c935

UBUNTU: SAUCE: radeon: r100: Silence 'may be used uninitialized' warnings · 34f091b3

Tim Gardner authored Jan 07, 2016

  CC [M]  drivers/gpu/drm/radeon/r100.o
In file included from drivers/gpu/drm/radeon/radeon_mode.h:37:0,
                 from drivers/gpu/drm/radeon/radeon.h:80,
                 from drivers/gpu/drm/radeon/r100.c:33:
drivers/gpu/drm/radeon/r100.c: In function 'r100_bandwidth_update':
include/drm/drm_fixed.h:64:13: warning: 'crit_point_ff.full' may be used uninitialized in this function [-Wmaybe-uninitialized]
  u64 tmp = ((u64)A.full << 13);
             ^
drivers/gpu/drm/radeon/r100.c:3153:63: note: 'crit_point_ff.full' was declared here
  fixed20_12 peak_disp_bw, mem_bw, pix_clk, pix_clk2, temp_ff, crit_point_ff;
                                                               ^
drivers/gpu/drm/radeon/r100.c:3583:42: warning: 'disp_drain_rate.full' may be used uninitialized in this function [-Wmaybe-uninitialized]
     temp_ff.full = read_return_rate.full - disp_drain_rate.full;

gcc version 5.3.1 20151219 (Ubuntu 5.3.1-4ubuntu1)

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

34f091b3

UBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings · 5a22abd4

Tim Gardner authored Jan 07, 2016

  CC      security/apparmor/af_unix.o
In file included from ./arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from ./arch/x86/include/asm/cpumask.h:4,
                 from ./arch/x86/include/asm/msr.h:10,
                 from ./arch/x86/include/asm/processor.h:20,
                 from ./arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/mutex.h:18,
                 from include/net/af_unix.h:6,
                 from security/apparmor/include/af_unix.h:15,
                 from security/apparmor/af_unix.c:16:
security/apparmor/af_unix.c: In function 'unix_fs_perm':
security/apparmor/af_unix.c:29:18: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  AA_BUG(!UNIX_FS(u));
                  ^
include/asm-generic/bug.h:95:25: note: in definition of macro 'WARN'
  int __ret_warn_on = !!(condition);    \
                         ^
security/apparmor/include/apparmor.h:75:28: note: in expansion of macro 'AA_BUG_FMT'
 #define AA_BUG(X, args...) AA_BUG_FMT((X), "" args )
                            ^
security/apparmor/af_unix.c:29:2: note: in expansion of macro 'AA_BUG'
  AA_BUG(!UNIX_FS(u));
  ^
security/apparmor/include/af_unix.h:36:22: note: in expansion of macro 'UNIX_ANONYMOUS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                      ^
security/apparmor/af_unix.c:29:10: note: in expansion of macro 'UNIX_FS'
  AA_BUG(!UNIX_FS(u));
          ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from ./arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from ./arch/x86/include/asm/cpumask.h:4,
                 from ./arch/x86/include/asm/msr.h:10,
                 from ./arch/x86/include/asm/processor.h:20,
                 from ./arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/mutex.h:18,
                 from include/net/af_unix.h:6,
                 from security/apparmor/include/af_unix.h:15,
                 from security/apparmor/af_unix.c:16:
security/apparmor/af_unix.c:29:18: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  AA_BUG(!UNIX_FS(u));
                  ^
include/asm-generic/bug.h:95:25: note: in definition of macro 'WARN'
  int __ret_warn_on = !!(condition);    \
                         ^
security/apparmor/include/apparmor.h:75:28: note: in expansion of macro 'AA_BUG_FMT'
 #define AA_BUG(X, args...) AA_BUG_FMT((X), "" args )
                            ^
security/apparmor/af_unix.c:29:2: note: in expansion of macro 'AA_BUG'
  AA_BUG(!UNIX_FS(u));
  ^
security/apparmor/af_unix.c:29:10: note: in expansion of macro 'UNIX_FS'
  AA_BUG(!UNIX_FS(u));
          ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c: In function 'aa_unix_peer_perm':
security/apparmor/af_unix.c:529:14: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  if (UNIX_FS(peeru))
              ^
security/apparmor/include/af_unix.h:32:37: note: in definition of macro 'UNIX_ANONYMOUS'
 #define UNIX_ANONYMOUS(U) (!unix_sk(U)->addr)
                                     ^
security/apparmor/af_unix.c:529:6: note: in expansion of macro 'UNIX_FS'
  if (UNIX_FS(peeru))
      ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:529:14: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  if (UNIX_FS(peeru))
              ^
security/apparmor/include/af_unix.h:36:51: note: in definition of macro 'UNIX_FS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                                                   ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:531:19: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  else if (UNIX_FS(u))
                   ^
security/apparmor/include/af_unix.h:32:37: note: in definition of macro 'UNIX_ANONYMOUS'
 #define UNIX_ANONYMOUS(U) (!unix_sk(U)->addr)
                                     ^
security/apparmor/af_unix.c:531:11: note: in expansion of macro 'UNIX_FS'
  else if (UNIX_FS(u))
           ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^
In file included from security/apparmor/af_unix.c:16:0:
security/apparmor/af_unix.c:531:19: warning: passing argument 1 of 'unix_sk' from incompatible pointer type [-Wincompatible-pointer-types]
  else if (UNIX_FS(u))
                   ^
security/apparmor/include/af_unix.h:36:51: note: in definition of macro 'UNIX_FS'
 #define UNIX_FS(U) (!UNIX_ANONYMOUS(U) && unix_sk(U)->addr->name->sun_path[0])
                                                   ^
In file included from security/apparmor/include/af_unix.h:15:0,
                 from security/apparmor/af_unix.c:16:
include/net/af_unix.h:68:33: note: expected 'const struct sock *' but argument is of type 'struct unix_sock *'
 static inline struct unix_sock *unix_sk(const struct sock *sk)
                                 ^

Cc: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

5a22abd4

UBUNTU: SAUCE: add a sysctl to disable unprivileged user namespace unsharing · 92e575e7

Serge Hallyn authored Jan 05, 2016

It is turned on by default, but can be turned off if admins prefer or,
more importantly, if a security vulnerability is found.

The intent is to use this as mitigation so long as Ubuntu is on the
cutting edge of enablement for things like unprivileged filesystem
mounting.

(This patch is tweaked from the one currently still in Debian sid, which
in turn came from the patch we had in saucy)
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
[bwh: Remove unneeded binary sysctl bits]
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

92e575e7

UBUNTU: [Config] CONFIG_BLK_DEV_LOOP=y for s390x · 93f3babb

Tim Gardner authored Dec 16, 2015

BugLink: http://bugs.launchpad.net/bugs/1526869Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

93f3babb

UBUNTU: [Config] CONFIG_ZONE_DEVICE=y for amd64 · 06bcf7a1
Tim Gardner authored Jan 05, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
06bcf7a1

UBUNTU: SAUCE: crypto: nx-842 - Mask XERS0 bit in return value · e17f0d17

Haren Myneni authored Dec 13, 2015

BugLink: http://bugs.launchpad.net/bugs/1529666

NX842 coprocessor sets 3rd bit in CR register with XER[S0] which is
nothing to do with NX request. Since this bit can be set with other
valuable return status, mast this bit.

One of other bits (INITIATED, BUSY or REJECTED) will be returned for
any given NX request.
Signed-off-by: Haren Myneni <haren@us.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from linux-next commit 6333ed8f)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

e17f0d17

UBUNTU: Start new release · 4b044d18
Tim Gardner authored Jan 04, 2016
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
4b044d18
UBUNTU: Ubuntu-4.4.0-0.9 · 1bd9334c
Tim Gardner authored Jan 03, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
1bd9334c
UBUNTU: rebase to v4.4-rc8 · 765a94d3
Tim Gardner authored Jan 03, 2016
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
765a94d3
UBUNTU: Start new release · 63bc7ba5
Tim Gardner authored Jan 03, 2016
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
63bc7ba5
UBUNTU: Ubuntu-4.4.0-0.8 · 73c077cc
Tim Gardner authored Dec 29, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
73c077cc
UBUNTU: rebase to v4.4-rc7 · c883be3f
Tim Gardner authored Dec 28, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
c883be3f
UBUNTU: Start new release · 9528a62c
Tim Gardner authored Dec 28, 2015
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
9528a62c
UBUNTU: Ubuntu-4.4.0-0.7 · a57cf938
Tim Gardner authored Dec 22, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
a57cf938
UBUNTU: rebase to v4.4-rc6 · ee650305
Tim Gardner authored Dec 21, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
ee650305

UBUNTU: SAUCE: (noup) ptrace: being capable wrt a process requires mapped uids/gids · a76b8ce7

Jann Horn authored Dec 12, 2015

BugLink: http://bugs.launchpad.net/bugs/1527374

ptrace_has_cap() checks whether the current process should be
treated as having a certain capability for ptrace checks
against another process. Until now, this was equivalent to
has_ns_capability(current, target_ns, CAP_SYS_PTRACE).

However, if a root-owned process wants to enter a user
namespace for some reason without knowing who owns it and
therefore can't change to the namespace owner's uid and gid
before entering, as soon as it has entered the namespace,
the namespace owner can attach to it via ptrace and thereby
gain access to its uid and gid.

While it is possible for the entering process to switch to
the uid of a claimed namespace owner before entering,
causing the attempt to enter to fail if the claimed uid is
wrong, this doesn't solve the problem of determining an
appropriate gid.

With this change, the entering process can first enter the
namespace and then safely inspect the namespace's
properties, e.g. through /proc/self/{uid_map,gid_map},
assuming that the namespace owner doesn't have access to
uid 0.
Signed-off-by: Jann Horn <jann@thejh.net>
Reference: https://lkml.org/lkml/2015/12/12/259Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

a76b8ce7

UBUNTU: [Config] CONFIG_I2C_DESIGNWARE_BAYTRAIL=y, CONFIG_IOSF_MBI=y · 19c97f92

Hui Wang authored Dec 17, 2015

BugLink: http://bugs.launchpad.net/bugs/1527096

This commit wants to enable the Intel Baytrail I2C semaphore, this
driver was added into the kernel from v4.0.

The driver implements a hardware semphore to protect the I2C bus to
be shared among several users safely.

We have met a problem on a Cherry Trail platform, when we insert the
SD storage card into the SD slot, the system will hang, after enable
this driver in the kernel, the problem disappers.

This driver depends on the "CONFIG_IOSF_MBI=y", so we change this
config item from m to y.
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

19c97f92

UBUNTU: Start new release · a3226f44
Tim Gardner authored Dec 17, 2015
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
a3226f44
UBUNTU: Ubuntu-4.4.0-0.6 · 7dacab6e
Tim Gardner authored Dec 16, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
7dacab6e

UBUNTU: [Config] disable CONFIG_CRYPTO_AES_ARM64_CE* to avoid issues with... · fe1cbbb4

Andy Whitcroft authored Dec 15, 2015

UBUNTU: [Config] disable CONFIG_CRYPTO_AES_ARM64_CE* to avoid issues with ARMv8.1 support in latest compilers
Signed-off-by: Andy Whitcroft <apw@canonical.com>

fe1cbbb4

UBUNTU: [Config] disable CONFIG_ARM64_LSE_ATOMICS to avoid issues with ARMv8.1... · 39e41b3b

Andy Whitcroft authored Dec 15, 2015

UBUNTU: [Config] disable CONFIG_ARM64_LSE_ATOMICS to avoid issues with ARMv8.1 support in latest compilers
Signed-off-by: Andy Whitcroft <apw@canonical.com>

39e41b3b

UBUNTU: Start new release · 43353c54
Tim Gardner authored Dec 15, 2015
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
43353c54
UBUNTU: [Config] s390 -> s390x · 19fb9172
Tim Gardner authored Dec 15, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
19fb9172
UBUNTU: Ubuntu-4.4.0-0.5 · db572d89
Tim Gardner authored Dec 14, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
db572d89
UBUNTU: rebase to v4.4-rc5 · 45dbbebb
Tim Gardner authored Dec 14, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
45dbbebb
UBUNTU: [Config] s390x -- enable ABI checks · e4ff76d0
Andy Whitcroft authored Dec 09, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
e4ff76d0

UBUNTU: [Config] s390x -- add s390x ABI information · 862e7b20

Andy Whitcroft authored Dec 09, 2015

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

862e7b20

UBUNTU: [Config] s390x -- add architecture to getabis · 1336778d
Andy Whitcroft authored Dec 09, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
1336778d

UBUNTU: [Config] s390x -- enable tools · bd3cdf52

Andy Whitcroft authored Dec 09, 2015

We are not yet making tools packages for s390x. Enable the basic tools
to fill out this package.

BugLink: http://bugs.launchpad.net/bugs/1524319Signed-off-by: Andy Whitcroft <apw@canonical.com>

bd3cdf52

UBUNTU: [Config] Add s390 modules to nic-modules udeb · d87c1c45

Tim Gardner authored Dec 11, 2015

BugLink: http://bugs.launchpad.net/bugs/1525297Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

d87c1c45

UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations · e728ce04

Tim Gardner authored Oct 06, 2015

Annotations are unique to the derivative. Therefore, use annotations
found in the derivative config directory.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
(cherry picked from commit 4f92f80963c358c9716e70d912449a7c2a5808aa)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

e728ce04