Tim Gardner [Thu, 7 Jan 2016 16:39:21 +0000 (09:39 -0700)]
UBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings
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>
Haren Myneni [Sun, 13 Dec 2015 11:30:41 +0000 (03:30 -0800)]
UBUNTU: SAUCE: crypto: nx-842 - Mask XERS0 bit in return value
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 6333ed8f26cf77311088d2e2b7cf16d8480bcbb2) Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jann Horn [Sat, 12 Dec 2015 20:12:41 +0000 (21:12 +0100)]
UBUNTU: SAUCE: (noup) ptrace: being capable wrt a process requires mapped uids/gids
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/259 Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
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>
Tim Gardner [Tue, 6 Oct 2015 16:07:03 +0000 (10:07 -0600)]
UBUNTU: [Debian] config-check and prepare using ${DEBIAN}/config/annotations
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>
Tim Gardner [Wed, 2 Dec 2015 14:09:22 +0000 (07:09 -0700)]
SPL: Update with 4.4 support
Temporary hack until the archive package is updated. I
cherry picked commits from master e7b75d9b46fcfea149bf7fd1f53d40379e3c7b5d on
to spl-0.6.5-release, then rsync'd the whole thing.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 2 Dec 2015 13:55:25 +0000 (06:55 -0700)]
ZFS: Update with 4.4 support
Temporary hack until the archive package is updated. I
cherry picked commits from master 61d482f7cd1687177185140699c6843c904b38d4 on
to zfs-0.6.5-release, then rsync'd the whole thing.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Seth Forshee [Thu, 19 Nov 2015 13:43:33 +0000 (07:43 -0600)]
UBUNTU: [Config] CONFIG_DRM_AMDGPU_CIK=n
CIK support in amdgpu is currently experimental, and the upstream
maintainers do not recommend enabling it. Disabling CIK support
in amdgpu will result in falling back to the radeon driver, which
also supports this hardware.
BugLink: http://bugs.launchpad.net/bugs/1510405 Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Jay Vosburgh [Wed, 11 Nov 2015 13:04:50 +0000 (13:04 +0000)]
UBUNTU: SAUCE: fan: add VXLAN implementation
Generify the fan mapping support and utilise that to implement fan
mappings over vxlan transport.
Expose the existance of this functionality (when the module is loaded)
via an additional sysctl marker.
Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
[apw@canonical.com: added feature marker for fan over vxlan.] Signed-off-by: Andy Whitcroft <apw@canonical.com>
Dan Carpenter [Tue, 22 Sep 2015 12:32:07 +0000 (15:32 +0300)]
UBUNTU: SAUCE: (noup) cxlflash: a couple off by one bugs
BugLink: http://bugs.launchpad.net/bugs/1499849
The "> MAX_CONTEXT" should be ">= MAX_CONTEXT". Otherwise we go one
step beyond the end of the cfg->ctx_tbl[] array.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
BugLink: http://bugs.launchpad.net/bugs/1513583
Applications which use virtual LUN's that are backed by a physical LUN
over both adapter ports may experience an I/O failure in the event of
a link loss (e.g. cable pull).
Virtual LUNs may be accessed through one or both ports of the adapter.
This access is encoded in the translation entries that comprise the
virtual LUN and used by the AFU for load-balancing I/O and handling
failover scenarios. In a link loss scenario, even though the AFU is
able to maintain connectivity to the LUN, it is up to the application
to retry the failed I/O. When applications are unaware of the virtual
LUN's underlying topology, they are unable to make a sound decision of
when to retry an I/O and therefore are forced to make their reaction to
a failed I/O absolute. The result is either a failure to retry I/O or
increased latency for scenarios where a retry is pointless.
To remedy this scenario, provide feedback back to the application on
virtual LUN creation as to which ports the LUN may be accessed. LUN's
spanning both ports are candidates for a retry in a presence of an I/O
failure.
Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Manoj Kumar [Mon, 26 Oct 2015 15:50:47 +0000 (10:50 -0500)]
UBUNTU: SAUCE: (noup) cxlflash: Fix to escalate LINK_RESET also on port 1
BugLink: http://bugs.launchpad.net/bugs/1513583
The original fix to escalate a 'login timed out' error
to a LINK_RESET was only made for one of the two ports
on the card. This fix resolves the same issue for
the second port (port 1).
Signed-off-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
accept Bus options (PCI etc.) >> PCI support >> PCI host controller drivers
accept Cryptographic API
accept Cryptographic API >> Asymmetric (public-key cryptographic) key type
accept Cryptographic API >> Certificates for signature checking
accept Cryptographic API >> Hardware crypto devices
accept Cryptographic API >> Hardware crypto devices >> Freescale CAAM Job Ring driver backend
accept Device Drivers >> Character devices >> Hardware Random Number Generator Core support
accept Device Drivers >> Character devices >> Serial drivers >> 8250/16550 and compatible serial support >> Extended 8250/16550 serial driver options >> Support more than 4 legacy serial ports
accept Device Drivers >> Common Clock Framework
accept Device Drivers >> DMA Engine support
accept Device Drivers >> GPIO Support >> SPI GPIO expanders
accept Device Drivers >> Generic Thermal sysfs driver
accept Device Drivers >> Graphics support >> Backlight & LCD device support >> Lowlevel Backlight controls
accept Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)
accept Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> Display Interface Bridges
accept Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> Display Panels
accept Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> MSM DRM >> Enable DSI support in MSM DRM driver
accept Device Drivers >> Graphics support >> Frame buffer Devices >> Support for frame buffer devices
accept Device Drivers >> HID support >> HID bus support >> Special HID drivers
accept Device Drivers >> Hardware Monitoring support >> PMBus support
accept Device Drivers >> I2C support >> I2C support >> I2C Hardware Bus support
accept Device Drivers >> I2C support >> I2C support >> Multiplexer I2C Chip support
accept Device Drivers >> Industrial I/O support >> Analog to digital converters
accept Device Drivers >> Industrial I/O support >> Light sensors
accept Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...) >> Keyboards
accept Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...) >> Touchscreens
accept Device Drivers >> LED Support >> LED Class Support
accept Device Drivers >> MMC/SD/SDIO card support >> Secure Digital Host Controller Interface support >> SDHCI platform and OF driver helper
accept Device Drivers >> Memory Controller drivers
accept Device Drivers >> Misc devices
accept Device Drivers >> Multifunction device drivers
accept Device Drivers >> Multimedia support >> Cameras/video grabbers support >> Memory-to-memory multimedia devices
accept Device Drivers >> Multimedia support >> Customise DVB Frontends
accept Device Drivers >> Multimedia support >> DVB platform devices
accept Device Drivers >> Multimedia support >> Media PCI Adapters
accept Device Drivers >> NVMEM Support
accept Device Drivers >> Network device support
accept Device Drivers >> Network device support >> Ethernet driver support >> 3Com devices
accept Device Drivers >> Network device support >> Ethernet driver support >> Broadcom devices
accept Device Drivers >> Network device support >> Ethernet driver support >> Cavium ethernet drivers
accept Device Drivers >> Network device support >> Ethernet driver support >> Intel devices
accept Device Drivers >> Network device support >> Ethernet driver support >> Intel devices >> Intel(R) 10GbE PCI Express adapters support
accept Device Drivers >> Network device support >> Ethernet driver support >> Marvell devices
accept Device Drivers >> Network device support >> Ethernet driver support >> Mellanox devices
accept Device Drivers >> Network device support >> Network core driver support
accept Device Drivers >> Network device support >> PHY Device support and infrastructure
accept Device Drivers >> Network device support >> USB Network Adapters
accept Device Drivers >> Network device support >> USB Network Adapters >> Multi-purpose USB Networking Framework
accept Device Drivers >> PHY Subsystem
accept Device Drivers >> Performance monitor support
accept Device Drivers >> Pin controllers
accept Device Drivers >> Platform support for Chrome hardware
accept Device Drivers >> Power supply class support >> Board level reset or power off
accept Device Drivers >> Pulse-Width Modulation (PWM) Support
accept Device Drivers >> Real Time Clock
accept Device Drivers >> Reliability, Availability and Serviceability (RAS) features
accept Device Drivers >> SCSI device support >> SCSI device support >> SCSI Device Handlers
accept Device Drivers >> SOC (System On Chip) specific Drivers
accept Device Drivers >> SPI support
accept Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support
accept Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> CODEC drivers
accept Device Drivers >> Staging drivers >> MOST driver
accept Device Drivers >> Staging drivers >> RDMA staging drivers
accept Device Drivers >> Staging drivers >> RDMA staging drivers >> Intel OPA Gen1 support
accept Device Drivers >> Staging drivers >> Support for small TFT LCD display modules
accept Device Drivers >> USB support >> Support for Host-side USB >> xHCI HCD (USB 3.0) support
accept Device Drivers >> USB support >> USB Physical Layer drivers
accept Device Drivers >> Voltage and Current Regulator Support
accept Device Drivers >> Watchdog Timer Support
accept Device Drivers >> X86 Platform Specific Device Drivers
accept Device Drivers >> Xen driver support
accept File systems >> The Extended 4 (ext4) filesystem
accept General setup
accept General setup >> Configure standard kernel features (expert users)
accept General setup >> Control Group support
accept Kernel hacking
accept Networking support
accept Networking support >> Bluetooth subsystem support >> Bluetooth Classic (BR/EDR) features
accept Networking support >> Bluetooth subsystem support >> Bluetooth device drivers >> HCI UART driver
accept Networking support >> NFC subsystem support >> Near Field Communication (NFC) devices
accept Networking support >> Networking options >> MultiProtocol Label Switching
accept Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> IP virtual server support
accept Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> IP: Netfilter Configuration
accept Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> IPv6: Netfilter Configuration
accept Networking support >> Networking options >> TCP/IP networking >> The IPv6 protocol
accept Power management and ACPI options >> 8xx Machine Type >> Architecture: powerpc
accept Power management and ACPI options >> ACPI (Advanced Configuration and Power Interface) Support
accept Power management and ACPI options >> CPU Frequency scaling >> CPU Frequency scaling
accept Power management and ACPI options >> CPU Frequency scaling >> CPU Frequency scaling >> Generic DT based cpufreq driver
accept Processor type and features
accept Processor type and features >> Architecture: arm
accept Processor type and features >> Architecture: x86
accept Processor type and features >> Linux guest support >> Enable paravirtualization code >> Xen guest support >> Architecture: x86
accept Processor type and features >> Symmetric multi-processing support
accept System Type >> Architecture: arm
accept System Type >> Freescale i.MX family >> Architecture: arm
accept System Type >> MMU-based Paged Memory Management Support >> Renesas ARM SoCs >> Architecture: arm
accept System Type >> Marvell Berlin SoCs >> Architecture: arm
cleanup redundant entries
projects / mirror_ubuntu-zesty-kernel.git / log