319 Commits

Author SHA1 Message Date
Andreas Gruenbacher
1c0e83841c security: Make inode argument of inode_getsecid non-const
Make the inode argument of the inode_getsecid hook non-const so that we
can use it to revalidate invalid security labels.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <pmoore@redhat.com>
2022-03-04 20:17:03 +01:00
Nathan Chancellor
c1b3686825 Merge 4.4.221 into android-msm-wahoo-4.4
Changes in 4.4.221: (71 commits)
        ext4: fix extent_status fragmentation for plain files
        ALSA: hda - Fix incorrect usage of IS_REACHABLE()
        net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg()
        net: ipv4: avoid unused variable warning for sysctl
        crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static
        vti4: removed duplicate log message.
        scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login
        ceph: return ceph_mdsc_do_request() errors from __get_parent()
        ceph: don't skip updating wanted caps when cap is stale
        pwm: rcar: Fix late Runtime PM enablement
        scsi: iscsi: Report unbind session event when the target has been removed
        ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
        kernel/gcov/fs.c: gcov_seq_next() should increase position index
        ipc/util.c: sysvipc_find_ipc() should increase position index
        s390/cio: avoid duplicated 'ADD' uevents
        pwm: renesas-tpu: Fix late Runtime PM enablement
        pwm: bcm2835: Dynamically allocate base
        ipv6: fix restrict IPV6_ADDRFORM operation
        macvlan: fix null dereference in macvlan_device_event()
        net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node
        net/x25: Fix x25_neigh refcnt leak when receiving frame
        tcp: cache line align MAX_TCP_HEADER
        team: fix hang in team_mode_get()
        xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
        ALSA: hda: Remove ASUS ROG Zenith from the blacklist
        iio: xilinx-xadc: Fix ADC-B powerdown
        iio: xilinx-xadc: Fix clearing interrupt when enabling trigger
        iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode
        fs/namespace.c: fix mountpoint reference counter race
        USB: sisusbvga: Change port variable from signed to unsigned
        USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE
        drivers: usb: core: Don't disable irqs in usb_sg_wait() during URB submit.
        drivers: usb: core: Minimize irq disabling in usb_sg_cancel()
        USB: core: Fix free-while-in-use bug in the USB S-Glibrary
        USB: hub: Fix handling of connect changes during sleep
        ALSA: usx2y: Fix potential NULL dereference
        ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
        ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices
        KVM: Check validity of resolved slot when searching memslots
        KVM: VMX: Enable machine check support for 32bit targets
        tty: hvc: fix buffer overflow during hvc_alloc().
        tty: rocket, avoid OOB access
        usb-storage: Add unusual_devs entry for JMicron JMS566
        audit: check the length of userspace generated audit records
        ASoC: dapm: fixup dapm kcontrol widget
        ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
        staging: comedi: dt2815: fix writing hi byte of analog output
        staging: comedi: Fix comedi_device refcnt leak in comedi_open
        staging: vt6656: Fix drivers TBTT timing counter.
        staging: vt6656: Power save stop wake_up_count wrap around.
        UAS: no use logging any details in case of ENODEV
        UAS: fix deadlock in error handling and PM flushing work
        usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset()
        remoteproc: Fix wrong rvring index computation
        sctp: use right member as the param of list_for_each_entry
        fuse: fix possibly missed wake-up after abort
        mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer
        usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
        net/cxgb4: Check the return from t4_query_params properly
        perf/core: fix parent pid/tid in task exit events
        bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B
        scsi: target: fix PR IN / READ FULL STATUS for FC
        xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status
        ext4: convert BUG_ON's to WARN_ON's in mballoc.c
        ext4: avoid declaring fs inconsistent due to invalid file handles
        ext4: protect journal inode's blocks using block_validity
        ext4: don't perform block validity checks on the journal inode
        ext4: fix block validity checks for journal inodes using indirect blocks
        ext4: unsigned int compared against zero
        propagate_one(): mnt_set_mountpoint() needs mount_lock
        Linux 4.4.221

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	drivers/usb/gadget/function/f_fs.c
2020-05-02 08:44:27 -07:00
Paul Moore
1a8abec912 audit: check the length of userspace generated audit records
commit 763dafc520add02a1f4639b500c509acc0ea8e5b upstream.

Commit 756125289285 ("audit: always check the netlink payload length
in audit_receive_msg()") fixed a number of missing message length
checks, but forgot to check the length of userspace generated audit
records.  The good news is that you need CAP_AUDIT_WRITE to submit
userspace audit records, which is generally only given to trusted
processes, so the impact should be limited.

Cc: stable@vger.kernel.org
Fixes: 756125289285 ("audit: always check the netlink payload length in audit_receive_msg()")
Reported-by: syzbot+49e69b4d71a420ceda3e@syzkaller.appspotmail.com
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-05-02 17:20:48 +02:00
Nathan Chancellor
8de13f8453 Merge 4.4.216 into android-msm-wahoo-4.4
Changes in 4.4.216: (73 commits)
        iwlwifi: pcie: fix rb_allocator workqueue allocation
        ext4: fix potential race between online resizing and write operations
        ext4: fix potential race between s_flex_groups online resizing and access
        ext4: fix potential race between s_group_info online resizing and access
        ipmi:ssif: Handle a possible NULL pointer reference
        mac80211: consider more elements in parsing CRC
        cfg80211: check wiphy driver existence for drvinfo report
        cifs: Fix mode output in debugging statements
        cfg80211: add missing policy for NL80211_ATTR_STATUS_CODE
        sysrq: Restore original console_loglevel when sysrq disabled
        sysrq: Remove duplicated sysrq message
        net: fib_rules: Correctly set table field when table number exceeds 8 bits
        net: phy: restore mdio regs in the iproc mdio driver
        ipv6: Fix nlmsg_flags when splitting a multipath route
        ipv6: Fix route replacement with dev-only route
        sctp: move the format error check out of __sctp_sf_do_9_1_abort
        nfc: pn544: Fix occasional HW initialization failure
        net: sched: correct flower port blocking
        ext4: potential crash on allocation error in ext4_alloc_flex_bg_array()
        audit: fix error handling in audit_data_to_entry()
        HID: core: fix off-by-one memset in hid_report_raw_event()
        HID: core: increase HID report buffer size to 8KiB
        HID: hiddev: Fix race in in hiddev_disconnect()
        MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
        i2c: jz4780: silence log flood on txabrt
        ecryptfs: Fix up bad backport of fe2e082f5da5b4a0a92ae32978f81507ef37ec66
        include/linux/bitops.h: introduce BITS_PER_TYPE
        net: netlink: cap max groups which will be considered in netlink_bind()
        namei: only return -ECHILD from follow_dotdot_rcu()
        KVM: Check for a bad hva before dropping into the ghc slow path
        slip: stop double free sl->dev in slip_open
        mm: make page ref count overflow check tighter and more explicit
        mm: add 'try_get_page()' helper function
        mm, gup: remove broken VM_BUG_ON_PAGE compound check for hugepages
        mm, gup: ensure real head page is ref-counted when using hugepages
        mm: prevent get_user_pages() from overflowing page refcount
        pipe: add pipe_buf_get() helper
        fs: prevent page refcount overflow in pipe_buf_get
        audit: always check the netlink payload length in audit_receive_msg()
        serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE
        usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
        usb: gadget: serial: fix Tx stall after buffer overflow
        drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
        drm/msm/dsi: save pll state before dsi host is powered off
        net: ks8851-ml: Remove 8-bit bus accessors
        net: ks8851-ml: Fix 16-bit data access
        net: ks8851-ml: Fix 16-bit IO operation
        watchdog: da9062: do not ping the hw during stop()
        s390/cio: cio_ignore_proc_seq_next should increase position index
        cifs: don't leak -EAGAIN for stat() during reconnect
        usb: storage: Add quirk for Samsung Fit flash
        usb: quirks: add NO_LPM quirk for Logitech Screen Share
        usb: core: hub: do error out if usb_autopm_get_interface() fails
        usb: core: port: do error out if usb_autopm_get_interface() fails
        vgacon: Fix a UAF in vgacon_invert_region
        fat: fix uninit-memory access for partial initialized inode
        vt: selection, close sel_buffer race
        vt: selection, push console lock down
        vt: selection, push sel_lock up
        dmaengine: tegra-apb: Fix use-after-free
        dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
        ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
        ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
        ASoC: dapm: Correct DAPM handling of active widgets during shutdown
        RDMA/iwcm: Fix iwcm work deallocation
        RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
        ARM: imx: build v7_cpu_resume() unconditionally
        hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
        dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
        powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
        dm cache: fix a crash due to incorrect work item cancelling
        crypto: algif_skcipher - use ZERO_OR_NULL_PTR in skcipher_recvmsg_async
        Linux 4.4.216

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	drivers/usb/gadget/function/f_fs.c
	drivers/usb/gadget/function/u_serial.c
2020-03-11 00:24:24 -07:00
Paul Moore
25344530b5 audit: always check the netlink payload length in audit_receive_msg()
[ Upstream commit 756125289285f6e55a03861bf4b6257aa3d19a93 ]

This patch ensures that we always check the netlink payload length
in audit_receive_msg() before we take any action on the payload
itself.

Cc: stable@vger.kernel.org
Reported-by: syzbot+399c44bf1f43b8747403@syzkaller.appspotmail.com
Reported-by: syzbot+e4b12d8d202701f08b6d@syzkaller.appspotmail.com
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-03-11 07:51:15 +01:00
Nathan Chancellor
65117ae3b8 Merge 4.4.134 into android-msm-wahoo-4.4
Changes in 4.4.134: (267 commits)
        MIPS: ptrace: Expose FIR register through FP regset
        MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs
        KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable"
        affs_lookup(): close a race with affs_remove_link()
        aio: fix io_destroy(2) vs. lookup_ioctx() race
        ALSA: timer: Fix pause event notification
        mmc: sdhci-iproc: fix 32bit writes for TRANSFER_MODE register
        libata: Blacklist some Sandisk SSDs for NCQ
        libata: blacklist Micron 500IT SSD with MU01 firmware
        xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent
        Revert "ipc/shm: Fix shmat mmap nil-page protection"
        ipc/shm: fix shmat() nil address after round-down when remapping
        kasan: fix memory hotplug during boot
        kernel/sys.c: fix potential Spectre v1 issue
        kernel/signal.c: avoid undefined behaviour in kill_something_info
        xfs: remove racy hasattr check from attr ops
        do d_instantiate/unlock_new_inode combinations safely
        firewire-ohci: work around oversized DMA reads on JMicron controllers
        NFSv4: always set NFS_LOCK_LOST when a lock is lost.
        ALSA: hda - Use IS_REACHABLE() for dependency on input
        ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read()
        kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl
        tracing/hrtimer: Fix tracing bugs by taking all clock bases and modes into account
        PCI: Add function 1 DMA alias quirk for Marvell 9128
        tools lib traceevent: Simplify pointer print logic and fix %pF
        perf callchain: Fix attr.sample_max_stack setting
        tools lib traceevent: Fix get_field_str() for dynamic strings
        dm thin: fix documentation relative to low water mark threshold
        nfs: Do not convert nfs_idmap_cache_timeout to jiffies
        watchdog: sp5100_tco: Fix watchdog disable bit
        kconfig: Don't leak main menus during parsing
        kconfig: Fix automatic menu creation mem leak
        kconfig: Fix expr_free() E_NOT leak
        mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
        ipmi/powernv: Fix error return code in ipmi_powernv_probe()
        Btrfs: set plug for fsync
        btrfs: Fix out of bounds access in btrfs_search_slot
        Btrfs: fix scrub to repair raid6 corruption
        scsi: fas216: fix sense buffer initialization
        HID: roccat: prevent an out of bounds read in kovaplus_profile_activated()
        jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path
        powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
        powerpc/numa: Ensure nodes initialized for hotplug
        RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure
        ntb_transport: Fix bug with max_mw_size parameter
        ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid
        ocfs2/acl: use 'ip_xattr_sem' to protect getting extended attribute
        ocfs2: return error when we attempt to access a dirty bh in jbd2
        mm/mempolicy: fix the check of nodemask from user
        mm/mempolicy: add nodes_empty check in SYSC_migrate_pages
        asm-generic: provide generic_pmdp_establish()
        mm: pin address_space before dereferencing it while isolating an LRU page
        IB/ipoib: Fix for potential no-carrier state
        x86/power: Fix swsusp_arch_resume prototype
        firmware: dmi_scan: Fix handling of empty DMI strings
        ACPI: processor_perflib: Do not send _PPC change notification if not ready
        bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y
        MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
        xen-netfront: Fix race between device setup and open
        xen/grant-table: Use put_page instead of free_page
        RDS: IB: Fix null pointer issue
        arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics
        proc: fix /proc/*/map_files lookup
        cifs: silence compiler warnings showing up with gcc-8.0.0
        bcache: properly set task state in bch_writeback_thread()
        bcache: fix for allocator and register thread race
        bcache: fix for data collapse after re-attaching an attached device
        bcache: return attach error when no cache set exist
        tools/libbpf: handle issues with bpf ELF objects containing .eh_frames
        locking/qspinlock: Ensure node->count is updated before initialising node
        irqchip/gic-v3: Change pr_debug message to pr_devel
        scsi: ufs: Enable quirk to ignore sending WRITE_SAME command
        scsi: bnx2fc: Fix check in SCSI completion handler for timed out request
        scsi: sym53c8xx_2: iterator underflow in sym_getsync()
        scsi: mptfusion: Add bounds check in mptctl_hp_targetinfo()
        scsi: qla2xxx: Avoid triggering undefined behavior in qla2x00_mbx_completion()
        ARC: Fix malformed ARC_EMUL_UNALIGNED default
        usb: gadget: f_uac2: fix bFirstInterface in composite gadget
        usb: gadget: fsl_udc_core: fix ep valid checks
        usb: dwc2: Fix dwc2_hsotg_core_init_disconnected()
        selftests: memfd: add config fragment for fuse
        scsi: storvsc: Increase cmd_per_lun for higher speed devices
        scsi: aacraid: fix shutdown crash when init fails
        scsi: qla4xxx: skip error recovery in case of register disconnect.
        ARM: OMAP2+: timer: fix a kmemleak caused in omap_get_timer_dt
        ARM: OMAP3: Fix prm wake interrupt for resume
        ARM: OMAP1: clock: Fix debugfs_create_*() usage
        NFC: llcp: Limit size of SDP URI
        mac80211: round IEEE80211_TX_STATUS_HEADROOM up to multiple of 4
        md raid10: fix NULL deference in handle_write_completed()
        drm/exynos: fix comparison to bitshift when dealing with a mask
        usb: musb: fix enumeration after resume
        locking/xchg/alpha: Add unconditional memory barrier to cmpxchg()
        md: raid5: avoid string overflow warning
        kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE
        powerpc/bpf/jit: Fix 32-bit JIT for seccomp_data access
        s390/cio: fix return code after missing interrupt
        s390/cio: clear timer when terminating driver I/O
        ARM: OMAP: Fix dmtimer init for omap1
        smsc75xx: fix smsc75xx_set_features()
        regulatory: add NUL to request alpha2
        locking/xchg/alpha: Fix xchg() and cmpxchg() memory ordering bugs
        x86/topology: Update the 'cpu cores' field in /proc/cpuinfo correctly across CPU hotplug operations
        media: dmxdev: fix error code for invalid ioctls
        md/raid1: fix NULL pointer dereference
        batman-adv: fix packet checksum in receive path
        batman-adv: invalidate checksum on fragment reassembly
        netfilter: ebtables: convert BUG_ONs to WARN_ONs
        nvme-pci: Fix nvme queue cleanup if IRQ setup fails
        clocksource/drivers/fsl_ftm_timer: Fix error return checking
        r8152: fix tx packets accounting
        virtio-gpu: fix ioctl and expose the fixed status to userspace.
        dmaengine: rcar-dmac: fix max_chunk_size for R-Car Gen3
        bcache: fix kcrashes with fio in RAID5 backend dev
        sit: fix IFLA_MTU ignored on NEWLINK
        gianfar: Fix Rx byte accounting for ndev stats
        net/tcp/illinois: replace broken algorithm reference link
        xen/pirq: fix error path cleanup when binding MSIs
        Btrfs: send, fix issuing write op when processing hole in no data mode
        selftests/powerpc: Skip the subpage_prot tests if the syscall is unavailable
        KVM: PPC: Book3S HV: Fix VRMA initialization with 2MB or 1GB memory backing
        watchdog: f71808e_wdt: Fix magic close handling
        e1000e: Fix check_for_link return value with autoneg off
        e1000e: allocate ring descriptors with dma_zalloc_coherent
        usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers
        scsi: mpt3sas: Do not mark fw_event workqueue as WQ_MEM_RECLAIM
        scsi: sd: Keep disk read-only when re-reading partition
        fbdev: Fixing arbitrary kernel leak in case FBIOGETCMAP_SPARC in sbusfb_ioctl_helper().
        xen: xenbus: use put_device() instead of kfree()
        USB: OHCI: Fix NULL dereference in HCDs using HCD_LOCAL_MEM
        netfilter: ebtables: fix erroneous reject of last rule
        bnxt_en: Check valid VNIC ID in bnxt_hwrm_vnic_set_tpa().
        workqueue: use put_device() instead of kfree()
        ipv4: lock mtu in fnhe when received PMTU < net.ipv4.route.min_pmtu
        sunvnet: does not support GSO for sctp
        net: Fix vlan untag for bridge and vlan_dev with reorder_hdr off
        batman-adv: fix header size check in batadv_dbg_arp()
        vti4: Don't count header length twice on tunnel setup
        vti4: Don't override MTU passed on link creation via IFLA_MTU
        perf/cgroup: Fix child event counting bug
        RDMA/ucma: Correct option size check using optlen
        mm/mempolicy.c: avoid use uninitialized preferred_node
        selftests: ftrace: Add probe event argument syntax testcase
        selftests: ftrace: Add a testcase for string type with kprobe_event
        selftests: ftrace: Add a testcase for probepoint
        batman-adv: fix multicast-via-unicast transmission with AP isolation
        batman-adv: fix packet loss for broadcasted DHCP packets to a server
        ARM: 8748/1: mm: Define vdso_start, vdso_end as array
        net: qmi_wwan: add BroadMobi BM806U 2020:2033
        net/usb/qmi_wwan.c: Add USB id for lt4120 modem
        net-usb: add qmi_wwan if on lte modem wistron neweb d18q1
        llc: properly handle dev_queue_xmit() return value
        mm/kmemleak.c: wait for scan completion before disabling free
        net: Fix untag for vlan packets without ethernet header
        net: mvneta: fix enable of all initialized RXQs
        sh: fix debug trap failure to process signals before return to user
        x86/pgtable: Don't set huge PUD/PMD on non-leaf entries
        fs/proc/proc_sysctl.c: fix potential page fault while unregistering sysctl table
        swap: divide-by-zero when zero length swap file on ssd
        sr: get/drop reference to device in revalidate and check_events
        Force log to disk before reading the AGF during a fstrim
        cpufreq: CPPC: Initialize shared perf capabilities of CPUs
        scsi: aacraid: Insure command thread is not recursively stopped
        dp83640: Ensure against premature access to PHY registers after reset
        mm/ksm: fix interaction with THP
        mm: fix races between address_space dereference and free in page_evicatable
        Btrfs: bail out on error during replay_dir_deletes
        Btrfs: fix NULL pointer dereference in log_dir_items
        btrfs: Fix possible softlock on single core machines
        ocfs2/dlm: don't handle migrate lockres if already in shutdown
        sched/rt: Fix rq->clock_update_flags < RQCF_ACT_SKIP warning
        KVM: VMX: raise internal error for exception during invalid protected mode state
        fscache: Fix hanging wait on page discarded by writeback
        sparc64: Make atomic_xchg() an inline function rather than a macro.
        rtc: snvs: Fix usage of snvs_rtc_enable
        net: bgmac: Fix endian access in bgmac_dma_tx_ring_free()
        Bluetooth: btusb: Add USB ID 7392:a611 for Edimax EW-7611ULB
        btrfs: tests/qgroup: Fix wrong tree backref level
        Btrfs: fix copy_items() return value when logging an inode
        btrfs: fix lockdep splat in btrfs_alloc_subvolume_writers
        xen/acpi: off by one in read_acpi_id()
        ACPI: acpi_pad: Fix memory leak in power saving threads
        powerpc/mpic: Check if cpu_possible() in mpic_physmask()
        m68k: set dma and coherent masks for platform FEC ethernets
        parisc/pci: Switch LBA PCI bus from Hard Fail to Soft Fail mode
        hwmon: (nct6775) Fix writing pwmX_mode
        rtc: hctosys: Ensure system time doesn't overflow time_t
        powerpc/perf: Prevent kernel address leak to userspace via BHRB buffer
        powerpc/perf: Fix kernel address leak via sampling registers
        tools/thermal: tmon: fix for segfault
        selftests: Print the test we're running to /dev/kmsg
        net/mlx5: Protect from command bit overflow
        ath10k: Fix kernel panic while using worker (ath10k_sta_rc_update_wk)
        ima: Fix Kconfig to select TPM 2.0 CRB interface
        ima: Fallback to the builtin hash algorithm
        virtio-net: Fix operstate for virtio when no VIRTIO_NET_F_STATUS
        arm: dts: socfpga: fix GIC PPI warning
        usb: dwc3: Update DWC_usb31 GTXFIFOSIZ reg fields
        cpufreq: cppc_cpufreq: Fix cppc_cpufreq_init() failure path
        clk: Don't show the incorrect clock phase
        zorro: Set up z->dev.dma_mask for the DMA API
        bcache: quit dc->writeback_thread when BCACHE_DEV_DETACHING is set
        ACPICA: Events: add a return on failure from acpi_hw_register_read
        ACPICA: acpi: acpica: fix acpi operand cache leak in nseval.c
        i2c: mv64xxx: Apply errata delay only in standard mode
        KVM: lapic: stop advertising DIRECTED_EOI when in-kernel IOAPIC is in use
        xhci: zero usb device slot_id member when disabling and freeing a xhci slot
        MIPS: ath79: Fix AR724X_PLL_REG_PCIE_CONFIG offset
        PCI: Restore config space on runtime resume despite being unbound
        ipmi_ssif: Fix kernel panic at msg_done_handler
        usb: dwc2: Fix interval type issue
        usb: gadget: ffs: Let setup() return USB_GADGET_DELAYED_STATUS
        usb: gadget: ffs: Execute copy_to_user() with USER_DS set
        powerpc: Add missing prototype for arch_irq_work_raise()
        ASoC: topology: create TLV data for dapm widgets
        perf/core: Fix perf_output_read_group()
        hwmon: (pmbus/max8688) Accept negative page register values
        hwmon: (pmbus/adm1275) Accept negative page register values
        cdrom: do not call check_disk_change() inside cdrom_open()
        gfs2: Fix fallocate chunk size
        usb: gadget: udc: change comparison to bitshift when dealing with a mask
        usb: gadget: composite: fix incorrect handling of OS desc requests
        x86/devicetree: Initialize device tree before using it
        x86/devicetree: Fix device IRQ settings in DT
        ALSA: vmaster: Propagate slave error
        media: cx23885: Override 888 ImpactVCBe crystal frequency
        media: cx23885: Set subdev host data to clk_freq pointer
        media: s3c-camif: fix out-of-bounds array access
        dmaengine: pl330: fix a race condition in case of threaded irqs
        media: em28xx: USB bulk packet size fix
        clk: rockchip: Prevent calculating mmc phase if clock rate is zero
        enic: enable rq before updating rq descriptors
        hwrng: stm32 - add reset during probe
        staging: rtl8192u: return -ENOMEM on failed allocation of priv->oldaddr
        rtc: tx4939: avoid unintended sign extension on a 24 bit shift
        serial: xuartps: Fix out-of-bounds access through DT alias
        serial: samsung: Fix out-of-bounds access through serial port index
        serial: mxs-auart: Fix out-of-bounds access through serial port index
        serial: imx: Fix out-of-bounds access through serial port index
        serial: fsl_lpuart: Fix out-of-bounds access through DT alias
        serial: arc_uart: Fix out-of-bounds access through DT alias
        PCI: Add function 1 DMA alias quirk for Marvell 88SE9220
        udf: Provide saner default for invalid uid / gid
        media: cx25821: prevent out-of-bounds read on array card
        clk: samsung: s3c2410: Fix PLL rates
        clk: samsung: exynos5260: Fix PLL rates
        clk: samsung: exynos5433: Fix PLL rates
        clk: samsung: exynos5250: Fix PLL rates
        clk: samsung: exynos3250: Fix PLL rates
        crypto: sunxi-ss - Add MODULE_ALIAS to sun4i-ss
        audit: return on memory error to avoid null pointer dereference
        MIPS: Octeon: Fix logging messages with spurious periods after newlines
        drm/rockchip: Respect page offset for PRIME mmap calls
        x86/apic: Set up through-local-APIC mode on the boot CPU if 'noapic' specified
        perf tests: Use arch__compare_symbol_names to compare symbols
        perf report: Fix memory corruption in --branch-history mode --branch-history
        selftests/net: fixes psock_fanout eBPF test case
        netlabel: If PF_INET6, check sk_buff ip header version
        scsi: lpfc: Fix issue_lip if link is disabled
        scsi: lpfc: Fix soft lockup in lpfc worker thread during LIP testing
        scsi: lpfc: Fix frequency of Release WQE CQEs
        regulator: of: Add a missing 'of_node_put()' in an error handling path of 'of_regulator_match()'
        ASoC: samsung: i2s: Ensure the RCLK rate is properly determined
        Bluetooth: btusb: Add device ID for RTL8822BE
        kdb: make "mdr" command repeat
        s390/ftrace: use expoline for indirect branches
        Linux 4.4.134

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	drivers/media/dvb-core/dmxdev.c
	drivers/scsi/sd.c
	drivers/scsi/ufs/ufshcd.c
	drivers/usb/gadget/function/f_fs.c
	fs/ecryptfs/inode.c
2018-05-30 00:55:08 -07:00
Richard Guy Briggs
699c079ae2 audit: return on memory error to avoid null pointer dereference
[ Upstream commit 23138ead270045f1b3e912e667967b6094244999 ]

If there is a memory allocation error when trying to change an audit
kernel feature value, the ignored allocation error will trigger a NULL
pointer dereference oops on subsequent use of that pointer.  Return
instead.

Passes audit-testsuite.
See: https://github.com/linux-audit/audit-kernel/issues/76

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: not necessary (other funcs check for NULL), but a good practice]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-05-30 07:49:16 +02:00
Nathan Chancellor
706f056db1 Merge 4.4.127 into android-msm-wahoo-4.4-oreo-m2
Changes in 4.4.127: (73 commits)
        mtd: jedec_probe: Fix crash in jedec_read_mfr()
        ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent()
        ALSA: pcm: potential uninitialized return values
        perf/hwbp: Simplify the perf-hwbp code, fix documentation
        partitions/msdos: Unable to mount UFS 44bsd partitions
        usb: gadget: define free_ep_req as universal function
        usb: gadget: change len to size_t on alloc_ep_req()
        usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align
        usb: gadget: align buffer size when allocating for OUT endpoint
        usb: gadget: f_hid: fix: Prevent accessing released memory
        kprobes/x86: Fix to set RWX bits correctly before releasing trampoline
        ACPI, PCI, irq: remove redundant check for null string pointer
        writeback: fix the wrong congested state variable definition
        PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
        dm ioctl: remove double parentheses
        Input: mousedev - fix implicit conversion warning
        netfilter: nf_nat_h323: fix logical-not-parentheses warning
        genirq: Use cpumask_available() for check of cpumask variable
        cpumask: Add helper cpumask_available()
        selinux: Remove unnecessary check of array base in selinux_set_mapping()
        fs: compat: Remove warning from COMPATIBLE_IOCTL
        jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp
        frv: declare jiffies to be located in the .data section
        audit: add tty field to LOGIN event
        tty: provide tty_name() even without CONFIG_TTY
        netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch
        selinux: Remove redundant check for unknown labeling behavior
        arm64: avoid overflow in VA_START and PAGE_OFFSET
        xfrm_user: uncoditionally validate esn replay attribute struct
        RDMA/ucma: Check AF family prior resolving address
        RDMA/ucma: Fix use-after-free access in ucma_close
        RDMA/ucma: Ensure that CM_ID exists prior to access it
        RDMA/ucma: Check that device is connected prior to access it
        RDMA/ucma: Check that device exists prior to accessing it
        RDMA/ucma: Don't allow join attempts for unsupported AF family
        RDMA/ucma: Introduce safer rdma_addr_size() variants
        net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms()
        xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems
        netfilter: bridge: ebt_among: add more missing match size checks
        netfilter: x_tables: add and use xt_check_proc_name
        Bluetooth: Fix missing encryption refresh on Security Request
        llist: clang: introduce member_address_is_nonnull()
        scsi: virtio_scsi: always read VPD pages for multiqueue too
        usb: dwc2: Improve gadget state disconnection handling
        USB: serial: ftdi_sio: add RT Systems VX-8 cable
        USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator
        USB: serial: cp210x: add ELDAT Easywave RX09 id
        mei: remove dev_err message on an unsupported ioctl
        media: usbtv: prevent double free in error case
        parport_pc: Add support for WCH CH382L PCI-E single parallel port card.
        crypto: ahash - Fix early termination in hash walk
        crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one
        fs/proc: Stop trying to report thread stacks
        staging: comedi: ni_mio_common: ack ai fifo error interrupts.
        Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list
        Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad
        vt: change SGR 21 to follow the standards
        Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition
        ARM: dts: dra7: Add power hold and power controller properties to palmas
        ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property
        md/raid10: reset the 'first' at the end of loop
        net: hns: Fix ethtool private flags
        nospec: Move array_index_nospec() parameter checking into separate macro
        nospec: Kill array_index_nospec_mask_check()
        Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()"
        Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"
        Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"
        Revert "cpufreq: Fix governor module removal race"
        Revert "mtip32xx: use runtime tag to initialize command header"
        spi: davinci: fix up dma_mapping_error() incorrect patch
        net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata"
        Revert "ip6_vti: adjust vti mtu according to mtu of lower device"
        Linux 4.4.127

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	arch/arm64/include/asm/memory.h
	fs/proc/task_mmu.c
	include/linux/jiffies.h
	net/ipv4/netfilter/nf_nat_h323.c
2018-04-08 03:36:57 -07:00
Richard Guy Briggs
545853704b audit: add tty field to LOGIN event
commit db0a6fb5d97afe01fd9c47d37c6daa82d4d4001d upstream.

The tty field was missing from AUDIT_LOGIN events.

Refactor code to create a new function audit_get_tty(), using it to
replace the call in audit_log_task_info() and to add it to
audit_log_set_loginuid().  Lock and bump the kref to protect it, adding
audit_put_tty() alias to decrement it.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-04-08 11:51:57 +02:00
Nathan Chancellor
e8abf4dcf6 Merge 4.4.106 into android-msm-wahoo-4.4-oreo-mr1
Changes in 4.4.106: (106 commits)
        can: ti_hecc: Fix napi poll return value for repoll
        can: kvaser_usb: free buf in error paths
        can: kvaser_usb: Fix comparison bug in kvaser_usb_read_bulk_callback()
        can: kvaser_usb: ratelimit errors if incomplete messages are received
        can: kvaser_usb: cancel urb on -EPIPE and -EPROTO
        can: ems_usb: cancel urb on -EPIPE and -EPROTO
        can: esd_usb2: cancel urb on -EPIPE and -EPROTO
        can: usb_8dev: cancel urb on -EPIPE and -EPROTO
        virtio: release virtio index when fail to device_register
        hv: kvp: Avoid reading past allocated blocks from KVP file
        isa: Prevent NULL dereference in isa_bus driver callbacks
        scsi: libsas: align sata_device's rps_resp on a cacheline
        efi: Move some sysfs files to be read-only by root
        ASN.1: fix out-of-bounds read when parsing indefinite length item
        ASN.1: check for error from ASN1_OP_END__ACT actions
        X.509: reject invalid BIT STRING for subjectPublicKey
        x86/PCI: Make broadcom_postcore_init() check acpi_disabled
        ALSA: pcm: prevent UAF in snd_pcm_info
        ALSA: seq: Remove spurious WARN_ON() at timer check
        ALSA: usb-audio: Fix out-of-bound error
        ALSA: usb-audio: Add check return value for usb_string()
        iommu/vt-d: Fix scatterlist offset handling
        s390: fix compat system call table
        kdb: Fix handling of kallsyms_symbol_next() return value
        drm: extra printk() wrapper macros
        drm/exynos: gem: Drop NONCONTIG flag for buffers allocated without IOMMU
        media: dvb: i2c transfers over usb cannot be done from stack
        arm64: KVM: fix VTTBR_BADDR_MASK BUG_ON off-by-one
        KVM: VMX: remove I/O port 0x80 bypass on Intel hosts
        arm64: fpsimd: Prevent registers leaking from dead tasks
        ARM: BUG if jumping to usermode address in kernel mode
        ARM: avoid faulting on qemu
        scsi: storvsc: Workaround for virtual DVD SCSI version
        thp: reduce indentation level in change_huge_pmd()
        thp: fix MADV_DONTNEED vs. numa balancing race
        mm: drop unused pmdp_huge_get_and_clear_notify()
        Revert "drm/armada: Fix compile fail"
        Revert "spi: SPI_FSL_DSPI should depend on HAS_DMA"
        Revert "s390/kbuild: enable modversions for symbols exported from asm"
        vti6: Don't report path MTU below IPV6_MIN_MTU.
        ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure
        x86/hpet: Prevent might sleep splat on resume
        selftest/powerpc: Fix false failures for skipped tests
        module: set __jump_table alignment to 8
        ARM: OMAP2+: Fix device node reference counts
        ARM: OMAP2+: Release device node after it is no longer needed.
        gpio: altera: Use handle_level_irq when configured as a level_high
        HID: chicony: Add support for another ASUS Zen AiO keyboard
        usb: gadget: configs: plug memory leak
        USB: gadgetfs: Fix a potential memory leak in 'dev_config()'
        kvm: nVMX: VMCLEAR should not cause the vCPU to shut down
        libata: drop WARN from protocol error in ata_sff_qc_issue()
        workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq
        scsi: lpfc: Fix crash during Hardware error recovery on SLI3 adapters
        irqchip/crossbar: Fix incorrect type of register size
        KVM: nVMX: reset nested_run_pending if the vCPU is going to be reset
        arm: KVM: Survive unknown traps from guests
        arm64: KVM: Survive unknown traps from guests
        spi_ks8995: fix "BUG: key accdaa28 not in .data!"
        bnx2x: prevent crash when accessing PTP with interface down
        bnx2x: fix possible overrun of VFPF multicast addresses array
        bnx2x: do not rollback VF MAC/VLAN filters we did not configure
        ipv6: reorder icmpv6_init() and ip6_mr_init()
        crypto: s5p-sss - Fix completing crypto request in IRQ handler
        i2c: riic: fix restart condition
        zram: set physical queue limits to avoid array out of bounds accesses
        netfilter: don't track fragmented packets
        axonram: Fix gendisk handling
        drm/amd/amdgpu: fix console deadlock if late init failed
        powerpc/powernv/ioda2: Gracefully fail if too many TCE levels requested
        EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro
        EDAC, i5000, i5400: Fix definition of NRECMEMB register
        kbuild: pkg: use --transform option to prefix paths in tar
        mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
        route: also update fnhe_genid when updating a route cache
        route: update fnhe_expires for redirect when the fnhe exists
        lib/genalloc.c: make the avail variable an atomic_long_t
        dynamic-debug-howto: fix optional/omitted ending line number to be LARGE instead of 0
        NFS: Fix a typo in nfs_rename()
        sunrpc: Fix rpc_task_begin trace point
        block: wake up all tasks blocked in get_request()
        sparc64/mm: set fields in deferred pages
        sctp: do not free asoc when it is already dead in sctp_sendmsg
        sctp: use the right sk after waking up from wait_buf sleep
        atm: horizon: Fix irq release error
        jump_label: Invoke jump_label_test() via early_initcall()
        xfrm: Copy policy family in clone_policy
        IB/mlx4: Increase maximal message size under UD QP
        IB/mlx5: Assign send CQ and recv CQ of UMR QP
        afs: Connect up the CB.ProbeUuid
        ipvlan: fix ipv6 outbound device
        audit: ensure that 'audit=1' actually enables audit for PID 1
        ipmi: Stop timers before cleaning up the module
        s390: always save and restore all registers on context switch
        more bio_map_user_iov() leak fixes
        tipc: fix memory leak in tipc_accept_from_sock()
        rds: Fix NULL pointer dereference in __rds_rdma_map
        sit: update frag_off info
        packet: fix crash in fanout_demux_rollover()
        net/packet: fix a race in packet_bind() and packet_notifier()
        Revert "x86/efi: Build our own page table structures"
        Revert "x86/efi: Hoist page table switching code into efi_call_virt()"
        Revert "x86/mm/pat: Ensure cpa->pfn only contains page frame numbers"
        arm: KVM: Fix VTTBR_BADDR_MASK BUG_ON off-by-one
        usb: gadget: ffs: Forbid usb_ep_alloc_request from sleeping
        Linux 4.4.106

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	arch/arm/include/asm/kvm_arm.h
2017-12-16 08:34:22 -07:00
Paul Moore
b349571270 audit: ensure that 'audit=1' actually enables audit for PID 1
[ Upstream commit 173743dd99a49c956b124a74c8aacb0384739a4c ]

Prior to this patch we enabled audit in audit_init(), which is too
late for PID 1 as the standard initcalls are run after the PID 1 task
is forked.  This means that we never allocate an audit_context (see
audit_alloc()) for PID 1 and therefore miss a lot of audit events
generated by PID 1.

This patch enables audit as early as possible to help ensure that when
PID 1 is forked it can allocate an audit_context if required.

Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-12-16 10:33:56 +01:00
Paul Moore
f885566c5e BACKPORT: audit: consistently record PIDs with task_tgid_nr()
Unfortunately we record PIDs in audit records using a variety of
methods despite the correct way being the use of task_tgid_nr().
This patch converts all of these callers, except for the case of
AUDIT_SET in audit_receive_msg() (see the comment in the code).

Reported-by: Jeff Vander Stoep <jeffv@google.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

Bug: 28952093

(cherry picked from commit fa2bea2f5cca5b8d4a3e5520d2e8c0ede67ac108)
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Change-Id: If6645f9de8bc58ed9755f28dc6af5fbf08d72a00
2016-10-12 17:34:22 +05:30
Mel Gorman
d0164adc89 mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd
__GFP_WAIT has been used to identify atomic context in callers that hold
spinlocks or are in interrupts.  They are expected to be high priority and
have access one of two watermarks lower than "min" which can be referred
to as the "atomic reserve".  __GFP_HIGH users get access to the first
lower watermark and can be called the "high priority reserve".

Over time, callers had a requirement to not block when fallback options
were available.  Some have abused __GFP_WAIT leading to a situation where
an optimisitic allocation with a fallback option can access atomic
reserves.

This patch uses __GFP_ATOMIC to identify callers that are truely atomic,
cannot sleep and have no alternative.  High priority users continue to use
__GFP_HIGH.  __GFP_DIRECT_RECLAIM identifies callers that can sleep and
are willing to enter direct reclaim.  __GFP_KSWAPD_RECLAIM to identify
callers that want to wake kswapd for background reclaim.  __GFP_WAIT is
redefined as a caller that is willing to enter direct reclaim and wake
kswapd for background reclaim.

This patch then converts a number of sites

o __GFP_ATOMIC is used by callers that are high priority and have memory
  pools for those requests. GFP_ATOMIC uses this flag.

o Callers that have a limited mempool to guarantee forward progress clear
  __GFP_DIRECT_RECLAIM but keep __GFP_KSWAPD_RECLAIM. bio allocations fall
  into this category where kswapd will still be woken but atomic reserves
  are not used as there is a one-entry mempool to guarantee progress.

o Callers that are checking if they are non-blocking should use the
  helper gfpflags_allow_blocking() where possible. This is because
  checking for __GFP_WAIT as was done historically now can trigger false
  positives. Some exceptions like dm-crypt.c exist where the code intent
  is clearer if __GFP_DIRECT_RECLAIM is used instead of the helper due to
  flag manipulations.

o Callers that built their own GFP flags instead of starting with GFP_KERNEL
  and friends now also need to specify __GFP_KSWAPD_RECLAIM.

The first key hazard to watch out for is callers that removed __GFP_WAIT
and was depending on access to atomic reserves for inconspicuous reasons.
In some cases it may be appropriate for them to use __GFP_HIGH.

The second key hazard is callers that assembled their own combination of
GFP flags instead of starting with something like GFP_KERNEL.  They may
now wish to specify __GFP_KSWAPD_RECLAIM.  It's almost certainly harmless
if it's missed in most cases as other activity will wake kswapd.

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Vitaly Wool <vitalywool@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-11-06 17:50:42 -08:00
Paul Moore
233a68667c audit: make audit_log_common_recv_msg() a void function
It always returns zero and no one is checking the return value.

Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-11-04 08:23:52 -05:00
Saurabh Sengar
c5ea6efda6 audit: removing unused variable
Variable rc in not required as it is just used for unchanged for return,
and return is always 0 in the function.

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
[PM: fixed spelling errors in description]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-11-04 08:23:52 -05:00
Yaowei Bai
9fcf836b21 audit: audit_string_contains_control can be boolean
This patch makes audit_string_contains_control return bool to improve
readability due to this particular function only using either one or
zero as its return value.

Signed-off-by: Yaowei Bai <bywxiaobai@163.com>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-11-04 08:23:51 -05:00
Richard Guy Briggs
32a1dbaece audit: try harder to send to auditd upon netlink failure
There are several reports of the kernel losing contact with auditd when
it is, in fact, still running.  When this happens, kernel syslogs show:
	"audit: *NO* daemon at audit_pid=<pid>"
although auditd is still running, and is apparently happy, listening on
the netlink socket. The pid in the "*NO* daemon" message matches the pid
of the running auditd process.  Restarting auditd solves this.

The problem appears to happen randomly, and doesn't seem to be strongly
correlated to the rate of audit events being logged.  The problem
happens fairly regularly (every few days), but not yet reproduced to
order.

On production kernels, BUG_ON() is a no-op, so any error will trigger
this.

Commit 34eab0a7cd ("audit: prevent an older auditd shutdown from
orphaning a newer auditd startup") eliminates one possible cause.  This
isn't the case here, since the PID in the error message and the PID of
the running auditd match.

The primary expected cause of error here is -ECONNREFUSED when the audit
daemon goes away, when netlink_getsockbyportid() can't find the auditd
portid entry in the netlink audit table (or there is no receive
function).  If -EPERM is returned, that situation isn't likely to be
resolved in a timely fashion without administrator intervention.  In
both cases, reset the audit_pid.  This does not rule out a race
condition.  SELinux is expected to return zero since this isn't an INET
or INET6 socket.  Other LSMs may have other return codes.  Log the error
code for better diagnosis in the future.

In the case of -ENOMEM, the situation could be temporary, based on local
or general availability of buffers.  -EAGAIN should never happen since
the netlink audit (kernel) socket is set to MAX_SCHEDULE_TIMEOUT.
-ERESTARTSYS and -EINTR are not expected since this kernel thread is not
expected to receive signals.  In these cases (or any other unexpected
ones for now), report the error and re-schedule the thread, retrying up
to 5 times.

v2:
	Removed BUG_ON().
	Moved comma in pr_*() statements.
	Removed audit_strerror() text.

Reported-by: Vipin Rathor <v.rathor@gmail.com>
Reported-by: <ctcard@hotmail.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: applied rgb's fixup patch to correct audit_log_lost() format issues]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-11-04 08:23:50 -05:00
Linus Torvalds
425afcff13 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit update from Paul Moore:
 "This is one of the larger audit patchsets in recent history,
  consisting of eight patches and almost 400 lines of changes.

  The bulk of the patchset is the new "audit by executable"
  functionality which allows admins to set an audit watch based on the
  executable on disk.  Prior to this, admins could only track an
  application by PID, which has some obvious limitations.

  Beyond the new functionality we also have some refcnt fixes and a few
  minor cleanups"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  fixup: audit: implement audit by executable
  audit: implement audit by executable
  audit: clean simple fsnotify implementation
  audit: use macros for unset inode and device values
  audit: make audit_del_rule() more robust
  audit: fix uninitialized variable in audit_add_rule()
  audit: eliminate unnecessary extra layer of watch parent references
  audit: eliminate unnecessary extra layer of watch references
2015-09-08 13:34:59 -07:00
Richard Guy Briggs
84cb777e67 audit: use macros for unset inode and device values
Clean up a number of places were casted magic numbers are used to represent
unset inode and device numbers in preparation for the audit by executable path
patch set.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: enclosed the _UNSET macros in parentheses for ./scripts/checkpatch]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-08-06 14:39:02 -04:00
Linus Torvalds
4a10a91756 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
 "Four small audit patches for v4.2, all bug fixes.  Only 10 lines of
  change this time so very unremarkable, the patch subject lines pretty
  much tell the whole story"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: Fix check of return value of strnlen_user()
  audit: obsolete audit_context check is removed in audit_filter_rules()
  audit: fix for typo in comment to function audit_log_link_denied()
  lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type
2015-06-27 13:53:16 -07:00
Shailendra Verma
2201196479 audit: fix for typo in comment to function audit_log_link_denied()
Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-05-29 15:19:02 -04:00
Linus Torvalds
9ec3a646fe Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fourth vfs update from Al Viro:
 "d_inode() annotations from David Howells (sat in for-next since before
  the beginning of merge window) + four assorted fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  RCU pathwalk breakage when running into a symlink overmounting something
  fix I_DIO_WAKEUP definition
  direct-io: only inc/dec inode->i_dio_count for file systems
  fs/9p: fix readdir()
  VFS: assorted d_backing_inode() annotations
  VFS: fs/inode.c helpers: d_inode() annotations
  VFS: fs/cachefiles: d_backing_inode() annotations
  VFS: fs library helpers: d_inode() annotations
  VFS: assorted weird filesystems: d_inode() annotations
  VFS: normal filesystems (and lustre): d_inode() annotations
  VFS: security/: d_inode() annotations
  VFS: security/: d_backing_inode() annotations
  VFS: net/: d_inode() annotations
  VFS: net/unix: d_backing_inode() annotations
  VFS: kernel/: d_inode() annotations
  VFS: audit: d_backing_inode() annotations
  VFS: Fix up some ->d_inode accesses in the chelsio driver
  VFS: Cachefiles should perform fs modifications on the top layer only
  VFS: AF_UNIX sockets should call mknod on the top layer only
2015-04-26 17:22:07 -07:00
Linus Torvalds
27cf3a16b2 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
 "Seven audit patches for v4.1, all bug fixes.

  The largest, and perhaps most significant commit helps resolve some
  memory pressure issues related to the inode cache and audit, there are
  also a few small commits which help resolve some timing issues with
  the audit log queue, and the rest fall into the always popular "code
  clean-up" category.

  In general, nothing really substantial, just a nice set of maintenance
  patches"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: Remove condition which always evaluates to false
  audit: reduce mmap_sem hold for mm->exe_file
  audit: consolidate handling of mm->exe_file
  audit: code clean up
  audit: don't reset working wait time accidentally with auditd
  audit: don't lose set wait time on first successful call to audit_log_start()
  audit: move the tree pruning to a dedicated thread
2015-04-22 14:49:23 -07:00
David Howells
3b362157b2 VFS: audit: d_backing_inode() annotations
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-04-15 15:06:55 -04:00
Pranith Kumar
724e7bfcc5 audit: Remove condition which always evaluates to false
After commit 3e1d0bb622 ("audit: Convert int limit
uses to u32"), by converting an int to u32, few conditions will always evaluate
to false.

These warnings were emitted during compilation:

kernel/audit.c: In function ‘audit_set_enabled’:
kernel/audit.c:347:2: warning: comparison of unsigned expression < 0 is always
false [-Wtype-limits]
  if (state < AUDIT_OFF || state > AUDIT_LOCKED)
	  ^
	  kernel/audit.c: In function ‘audit_receive_msg’:
	  kernel/audit.c:880:9: warning: comparison of unsigned expression < 0 is
	  always false [-Wtype-limits]
	      if (s.backlog_wait_time < 0 ||

The following patch removes those unnecessary conditions.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-03-13 17:32:52 -04:00
Davidlohr Bueso
5b28255278 audit: reduce mmap_sem hold for mm->exe_file
The mm->exe_file is currently serialized with mmap_sem (shared)
in order to both safely (1) read the file and (2) audit it via
audit_log_d_path(). Good users will, on the other hand, make use
of the more standard get_mm_exe_file(), requiring only holding
the mmap_sem to read the value, and relying on reference counting
to make sure that the exe file won't dissapear underneath us.

Additionally, upon NULL return of get_mm_exe_file, we also call
audit_log_format(ab, " exe=(null)").

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-02-23 16:57:00 -05:00
Davidlohr Bueso
4766b199ef audit: consolidate handling of mm->exe_file
This patch adds a audit_log_d_path_exe() helper function
to share how we handle auditing of the exe_file's path.
Used by both audit and auditsc. No functionality is changed.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-02-23 16:55:47 -05:00
Ameen Ali
5985de6754 audit: code clean up
Fixed a coding style issue (unnecessary parentheses , unnecessary braces)

Signed-off-by: Ameen-Ali <Ameenali023@gmail.com>
[PM: tweaked subject line]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-02-23 15:38:00 -05:00
Richard Guy Briggs
efef73a1a2 audit: don't reset working wait time accidentally with auditd
During a queue overflow condition while we are waiting for auditd to drain the
queue to make room for regular messages, we don't want a successful auditd that
has bypassed the queue check to reset the backlog wait time.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-02-23 15:38:00 -05:00
Richard Guy Briggs
a77ed4e568 audit: don't lose set wait time on first successful call to audit_log_start()
Copy the set wait time to a working value to avoid losing the set
value if the queue overflows.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
2015-02-23 15:37:59 -05:00
Linus Torvalds
2c90331cf5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:

 1) Fix double SKB free in bluetooth 6lowpan layer, from Jukka Rissanen.

 2) Fix receive checksum handling in enic driver, from Govindarajulu
    Varadarajan.

 3) Fix NAPI poll list corruption in virtio_net and caif_virtio, from
    Herbert Xu.  Also, add code to detect drivers that have this mistake
    in the future.

 4) Fix doorbell endianness handling in mlx4 driver, from Amir Vadai.

 5) Don't clobber IP6CB() before xfrm6_policy_check() is called in TCP
    input path,f rom Nicolas Dichtel.

 6) Fix MPLS action validation in openvswitch, from Pravin B Shelar.

 7) Fix double SKB free in vxlan driver, also from Pravin.

 8) When we scrub a packet, which happens when we are switching the
    context of the packet (namespace, etc.), we should reset the
    secmark.  From Thomas Graf.

 9) ->ndo_gso_check() needs to do more than return true/false, it also
    has to allow the driver to clear netdev feature bits in order for
    the caller to be able to proceed properly.  From Jesse Gross.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
  genetlink: A genl_bind() to an out-of-range multicast group should not WARN().
  netlink/genetlink: pass network namespace to bind/unbind
  ne2k-pci: Add pci_disable_device in error handling
  bonding: change error message to debug message in __bond_release_one()
  genetlink: pass multicast bind/unbind to families
  netlink: call unbind when releasing socket
  netlink: update listeners directly when removing socket
  genetlink: pass only network namespace to genl_has_listeners()
  netlink: rename netlink_unbind() to netlink_undo_bind()
  net: Generalize ndo_gso_check to ndo_features_check
  net: incorrect use of init_completion fixup
  neigh: remove next ptr from struct neigh_table
  net: xilinx: Remove unnecessary temac_property in the driver
  net: phy: micrel: use generic config_init for KSZ8021/KSZ8031
  net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
  openvswitch: fix odd_ptr_err.cocci warnings
  Bluetooth: Fix accepting connections when not using mgmt
  Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDR
  brcmfmac: Do not crash if platform data is not populated
  ipw2200: select CFG80211_WEXT
  ...
2014-12-30 10:45:47 -08:00
Johannes Berg
023e2cfa36 netlink/genetlink: pass network namespace to bind/unbind
Netlink families can exist in multiple namespaces, and for the most
part multicast subscriptions are per network namespace. Thus it only
makes sense to have bind/unbind notifications per network namespace.

To achieve this, pass the network namespace of a given client socket
to the bind/unbind functions.

Also do this in generic netlink, and there also make sure that any
bind for multicast groups that only exist in init_net is rejected.
This isn't really a problem if it is accepted since a client in a
different namespace will never receive any notifications from such
a group, but it can confuse the family if not rejected (it's also
possible to silently (without telling the family) accept it, but it
would also have to be ignored on unbind so families that take any
kind of action on bind/unbind won't do unnecessary work for invalid
clients like that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-27 03:07:50 -05:00
Linus Torvalds
66b3f4f0a0 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
 "Four patches to fix various problems with the audit subsystem, all are
  fairly small and straightforward.

  One patch fixes a problem where we weren't using the correct gfp
  allocation flags (GFP_KERNEL regardless of context, oops), one patch
  fixes a problem with old userspace tools (this was broken for a
  while), one patch fixes a problem where we weren't recording pathnames
  correctly, and one fixes a problem with PID based filters.

  In general I don't think there is anything controversial with this
  patchset, and it fixes some rather unfortunate bugs; the allocation
  flag one can be particularly scary looking for users"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: restore AUDIT_LOGINUID unset ABI
  audit: correctly record file names with different path name types
  audit: use supplied gfp_mask from audit_buffer in kauditd_send_multicast_skb
  audit: don't attempt to lookup PIDs when changing PID filtering audit rules
2014-12-23 18:13:16 -08:00
Richard Guy Briggs
54dc77d974 audit: use supplied gfp_mask from audit_buffer in kauditd_send_multicast_skb
Eric Paris explains: Since kauditd_send_multicast_skb() gets called in
audit_log_end(), which can come from any context (aka even a sleeping context)
GFP_KERNEL can't be used.  Since the audit_buffer knows what context it should
use, pass that down and use that.

See: https://lkml.org/lkml/2014/12/16/542

BUG: sleeping function called from invalid context at mm/slab.c:2849
in_atomic(): 1, irqs_disabled(): 0, pid: 885, name: sulogin
2 locks held by sulogin/885:
  #0:  (&sig->cred_guard_mutex){+.+.+.}, at: [<ffffffff91152e30>] prepare_bprm_creds+0x28/0x8b
  #1:  (tty_files_lock){+.+.+.}, at: [<ffffffff9123e787>] selinux_bprm_committing_creds+0x55/0x22b
CPU: 1 PID: 885 Comm: sulogin Not tainted 3.18.0-next-20141216 #30
Hardware name: Dell Inc. Latitude E6530/07Y85M, BIOS A15 06/20/2014
  ffff880223744f10 ffff88022410f9b8 ffffffff916ba529 0000000000000375
  ffff880223744f10 ffff88022410f9e8 ffffffff91063185 0000000000000006
  0000000000000000 0000000000000000 0000000000000000 ffff88022410fa38
Call Trace:
  [<ffffffff916ba529>] dump_stack+0x50/0xa8
  [<ffffffff91063185>] ___might_sleep+0x1b6/0x1be
  [<ffffffff910632a6>] __might_sleep+0x119/0x128
  [<ffffffff91140720>] cache_alloc_debugcheck_before.isra.45+0x1d/0x1f
  [<ffffffff91141d81>] kmem_cache_alloc+0x43/0x1c9
  [<ffffffff914e148d>] __alloc_skb+0x42/0x1a3
  [<ffffffff914e2b62>] skb_copy+0x3e/0xa3
  [<ffffffff910c263e>] audit_log_end+0x83/0x100
  [<ffffffff9123b8d3>] ? avc_audit_pre_callback+0x103/0x103
  [<ffffffff91252a73>] common_lsm_audit+0x441/0x450
  [<ffffffff9123c163>] slow_avc_audit+0x63/0x67
  [<ffffffff9123c42c>] avc_has_perm+0xca/0xe3
  [<ffffffff9123dc2d>] inode_has_perm+0x5a/0x65
  [<ffffffff9123e7ca>] selinux_bprm_committing_creds+0x98/0x22b
  [<ffffffff91239e64>] security_bprm_committing_creds+0xe/0x10
  [<ffffffff911515e6>] install_exec_creds+0xe/0x79
  [<ffffffff911974cf>] load_elf_binary+0xe36/0x10d7
  [<ffffffff9115198e>] search_binary_handler+0x81/0x18c
  [<ffffffff91153376>] do_execveat_common.isra.31+0x4e3/0x7b7
  [<ffffffff91153669>] do_execve+0x1f/0x21
  [<ffffffff91153967>] SyS_execve+0x25/0x29
  [<ffffffff916c61a9>] stub_execve+0x69/0xa0

Cc: stable@vger.kernel.org #v3.16-rc1
Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Tested-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Paul Moore <pmoore@redhat.com>
2014-12-19 18:37:56 -05:00
Linus Torvalds
a99abce2d9 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
 "Two small patches from the audit next branch; only one of which has
  any real significant code changes, the other is simply a MAINTAINERS
  update for audit.

  The single code patch is pretty small and rather straightforward, it
  changes the audit "version" number reported to userspace from an
  integer to a bitmap which is used to indicate the functionality of the
  running kernel.  This really doesn't have much impact on the kernel,
  but it will make life easier for the audit userspace folks.

  Thankfully we were still on a version number which allowed us to do
  this without breaking userspace"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: convert status version to a feature bitmap
  audit: add Paul Moore to the MAINTAINERS entry
2014-12-13 13:41:28 -08:00
Linus Torvalds
86c6a2fddf Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler updates from Ingo Molnar:
 "The main changes in this cycle are:

   - 'Nested Sleep Debugging', activated when CONFIG_DEBUG_ATOMIC_SLEEP=y.

     This instruments might_sleep() checks to catch places that nest
     blocking primitives - such as mutex usage in a wait loop.  Such
     bugs can result in hard to debug races/hangs.

     Another category of invalid nesting that this facility will detect
     is the calling of blocking functions from within schedule() ->
     sched_submit_work() -> blk_schedule_flush_plug().

     There's some potential for false positives (if secondary blocking
     primitives themselves are not ready yet for this facility), but the
     kernel will warn once about such bugs per bootup, so the warning
     isn't much of a nuisance.

     This feature comes with a number of fixes, for problems uncovered
     with it, so no messages are expected normally.

   - Another round of sched/numa optimizations and refinements, for
     CONFIG_NUMA_BALANCING=y.

   - Another round of sched/dl fixes and refinements.

  Plus various smaller fixes and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
  sched: Add missing rcu protection to wake_up_all_idle_cpus
  sched/deadline: Introduce start_hrtick_dl() for !CONFIG_SCHED_HRTICK
  sched/numa: Init numa balancing fields of init_task
  sched/deadline: Remove unnecessary definitions in cpudeadline.h
  sched/cpupri: Remove unnecessary definitions in cpupri.h
  sched/deadline: Fix rq->dl.pushable_tasks bug in push_dl_task()
  sched/fair: Fix stale overloaded status in the busiest group finding logic
  sched: Move p->nr_cpus_allowed check to select_task_rq()
  sched/completion: Document when to use wait_for_completion_io_*()
  sched: Update comments about CLONE_NEWUTS and CLONE_NEWIPC
  sched/fair: Kill task_struct::numa_entry and numa_group::task_list
  sched: Refactor task_struct to use numa_faults instead of numa_* pointers
  sched/deadline: Don't check CONFIG_SMP in switched_from_dl()
  sched/deadline: Reschedule from switched_from_dl() after a successful pull
  sched/deadline: Push task away if the deadline is equal to curr during wakeup
  sched/deadline: Add deadline rq status print
  sched/deadline: Fix artificial overrun introduced by yield_task_dl()
  sched/rt: Clean up check_preempt_equal_prio()
  sched/core: Use dl_bw_of() under rcu_read_lock_sched()
  sched: Check if we got a shallowest_idle_cpu before searching for least_loaded_cpu
  ...
2014-12-09 21:21:34 -08:00
Paul Moore
0f7e94ee40 Merge branch 'next' into upstream for v3.19 2014-12-09 14:38:30 -05:00
Richard Guy Briggs
0288d7183c audit: convert status version to a feature bitmap
The version field defined in the audit status structure was found to have
limitations in terms of its expressibility of features supported.  This is
distict from the get/set features call to be able to command those features
that are present.

Converting this field from a version number to a feature bitmap will allow
distributions to selectively backport and support certain features and will
allow upstream to be able to deprecate features in the future.  It will allow
userspace clients to first query the kernel for which features are actually
present and supported.  Currently, EINVAL is returned rather than EOPNOTSUP,
which isn't helpful in determining if there was an error in the command, or if
it simply isn't supported yet.  Past features are not represented by this
bitmap, but their use may be converted to EOPNOTSUP if needed in the future.

Since "version" is too generic to convert with a #define, use a union in the
struct status, introducing the member "feature_bitmap" unionized with
"version".

Convert existing AUDIT_VERSION_* macros over to AUDIT_FEATURE_BITMAP*
counterparts, leaving the former for backwards compatibility.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: minor whitespace tweaks]
Signed-off-by: Paul Moore <pmoore@redhat.com>
2014-11-17 16:53:51 -05:00
Linus Torvalds
911883759f Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
 "After he sent the initial audit pull request for 3.18, Eric asked me
  to take over the management of the audit tree, hence this pull request
  to fix a couple of problems with audit.

  As you can see below, the changes are minimal: adding some whitespace
  to a string so userspace parses it correctly, and fixing a problem
  with audit's usage of fsnotify that was causing audit watch rules to
  be lost.  Neither of these patches were very controversial on the
  mailing lists and they fix real problems, getting them into 3.18 would
  be a good thing"

* 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit:
  audit: keep inode pinned
  audit: AUDIT_FEATURE_CHANGE message format missing delimiting space
2014-11-13 09:36:39 -08:00
Peter Zijlstra
6b55fc63f4 audit, sched/wait: Fixup kauditd_thread() wait loop
The kauditd_thread wait loop is a bit iffy; it has a number of problems:

 - calls try_to_freeze() before schedule(); you typically want the
   thread to re-evaluate the sleep condition when unfreezing, also
   freeze_task() issues a wakeup.

 - it unconditionally does the {add,remove}_wait_queue(), even when the
   sleep condition is false.

Use wait_event_freezable() that does the right thing.

Reported-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: oleg@redhat.com
Cc: Eric Paris <eparis@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20141002102251.GA6324@worktop.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-11-04 07:17:47 +01:00
Richard Guy Briggs
897f1acbb6 audit: AUDIT_FEATURE_CHANGE message format missing delimiting space
Add a space between subj= and feature= fields to make them parsable.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paul Moore <pmoore@redhat.com>
2014-10-30 19:42:02 -04:00
Linus Torvalds
ab074ade9c Merge git://git.infradead.org/users/eparis/audit
Pull audit updates from Eric Paris:
 "So this change across a whole bunch of arches really solves one basic
  problem.  We want to audit when seccomp is killing a process.  seccomp
  hooks in before the audit syscall entry code.  audit_syscall_entry
  took as an argument the arch of the given syscall.  Since the arch is
  part of what makes a syscall number meaningful it's an important part
  of the record, but it isn't available when seccomp shoots the
  syscall...

  For most arch's we have a better way to get the arch (syscall_get_arch)
  So the solution was two fold: Implement syscall_get_arch() everywhere
  there is audit which didn't have it.  Use syscall_get_arch() in the
  seccomp audit code.  Having syscall_get_arch() everywhere meant it was
  a useless flag on the stack and we could get rid of it for the typical
  syscall entry.

  The other changes inside the audit system aren't grand, fixed some
  records that had invalid spaces.  Better locking around the task comm
  field.  Removing some dead functions and structs.  Make some things
  static.  Really minor stuff"

* git://git.infradead.org/users/eparis/audit: (31 commits)
  audit: rename audit_log_remove_rule to disambiguate for trees
  audit: cull redundancy in audit_rule_change
  audit: WARN if audit_rule_change called illegally
  audit: put rule existence check in canonical order
  next: openrisc: Fix build
  audit: get comm using lock to avoid race in string printing
  audit: remove open_arg() function that is never used
  audit: correct AUDIT_GET_FEATURE return message type
  audit: set nlmsg_len for multicast messages.
  audit: use union for audit_field values since they are mutually exclusive
  audit: invalid op= values for rules
  audit: use atomic_t to simplify audit_serial()
  kernel/audit.c: use ARRAY_SIZE instead of sizeof/sizeof[0]
  audit: reduce scope of audit_log_fcaps
  audit: reduce scope of audit_net_id
  audit: arm64: Remove the audit arch argument to audit_syscall_entry
  arm64: audit: Add audit hook in syscall_trace_enter/exit()
  audit: x86: drop arch from __audit_syscall_entry() interface
  sparc: implement is_32bit_task
  sparc: properly conditionalize use of TIF_32BIT
  ...
2014-10-19 16:25:56 -07:00
Richard Guy Briggs
9eab339b19 audit: get comm using lock to avoid race in string printing
When task->comm is passed directly to audit_log_untrustedstring() without
getting a copy or using the task_lock, there is a race that could happen that
would output a NULL (\0) in the output string that would effectively truncate
the rest of the report text after the comm= field in the audit, losing fields.

Use get_task_comm() to get a copy while acquiring the task_lock to prevent
this and to prevent the result from being a mixture of old and new values of
comm.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:56 -04:00
Richard Guy Briggs
9ef9151477 audit: correct AUDIT_GET_FEATURE return message type
When an AUDIT_GET_FEATURE message is sent from userspace to the kernel, it
should reply with a message tagged as an AUDIT_GET_FEATURE type with a struct
audit_feature.  The current reply is a message tagged as an AUDIT_GET
type with a struct audit_feature.

This appears to have been a cut-and-paste-eo in commit b0fed40.

Reported-by: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:55 -04:00
Richard Guy Briggs
54e05eddbe audit: set nlmsg_len for multicast messages.
Report:
	Looking at your example code in
	http://people.redhat.com/rbriggs/audit-multicast-listen/audit-multicast-listen.c,
	it seems that nlmsg_len field in the received messages is supposed to
	contain the length of the header + payload, but it is always set to the
	size of the header only, i.e. 16. The example program works, because
	the printf format specifies the minimum width, not "precision", so it
	simply prints out the payload until the first zero byte. This isn't too
	much of a problem, but precludes the use of recvmmsg, iiuc?

	(gdb) p *(struct nlmsghdr*)nlh
	$14 = {nlmsg_len = 16, nlmsg_type = 1100, nlmsg_flags = 0, nlmsg_seq = 0, nlmsg_pid = 9910}

The only time nlmsg_len would have been updated was at audit_buffer_alloc()
inside audit_log_start() and never updated after.  It should arguably be done
in audit_log_vformat(), but would be more efficient in audit_log_end().

Reported-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:54 -04:00
Richard Guy Briggs
01478d7d60 audit: use atomic_t to simplify audit_serial()
Since there is already a primitive to do this operation in the atomic_t, use it
to simplify audit_serial().

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:52 -04:00
Fabian Frederick
6eed9b2613 kernel/audit.c: use ARRAY_SIZE instead of sizeof/sizeof[0]
Use kernel.h definition.

Cc: Eric Paris <eparis@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:51 -04:00
Richard Guy Briggs
691e6d59d2 audit: reduce scope of audit_log_fcaps
audit_log_fcaps() isn't used outside kernel/audit.c.  Reduce its scope.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:51 -04:00
Richard Guy Briggs
c0a8d9b069 audit: reduce scope of audit_net_id
audit_net_id isn't used outside kernel/audit.c.  Reduce its scope.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
2014-09-23 16:37:50 -04:00
Eric Paris
7d8b6c6375 CAPABILITIES: remove undefined caps from all processes
This is effectively a revert of 7b9a7ec565
plus fixing it a different way...

We found, when trying to run an application from an application which
had dropped privs that the kernel does security checks on undefined
capability bits.  This was ESPECIALLY difficult to debug as those
undefined bits are hidden from /proc/$PID/status.

Consider a root application which drops all capabilities from ALL 4
capability sets.  We assume, since the application is going to set
eff/perm/inh from an array that it will clear not only the defined caps
less than CAP_LAST_CAP, but also the higher 28ish bits which are
undefined future capabilities.

The BSET gets cleared differently.  Instead it is cleared one bit at a
time.  The problem here is that in security/commoncap.c::cap_task_prctl()
we actually check the validity of a capability being read.  So any task
which attempts to 'read all things set in bset' followed by 'unset all
things set in bset' will not even attempt to unset the undefined bits
higher than CAP_LAST_CAP.

So the 'parent' will look something like:
CapInh:	0000000000000000
CapPrm:	0000000000000000
CapEff:	0000000000000000
CapBnd:	ffffffc000000000

All of this 'should' be fine.  Given that these are undefined bits that
aren't supposed to have anything to do with permissions.  But they do...

So lets now consider a task which cleared the eff/perm/inh completely
and cleared all of the valid caps in the bset (but not the invalid caps
it couldn't read out of the kernel).  We know that this is exactly what
the libcap-ng library does and what the go capabilities library does.
They both leave you in that above situation if you try to clear all of
you capapabilities from all 4 sets.  If that root task calls execve()
the child task will pick up all caps not blocked by the bset.  The bset
however does not block bits higher than CAP_LAST_CAP.  So now the child
task has bits in eff which are not in the parent.  These are
'meaningless' undefined bits, but still bits which the parent doesn't
have.

The problem is now in cred_cap_issubset() (or any operation which does a
subset test) as the child, while a subset for valid cap bits, is not a
subset for invalid cap bits!  So now we set durring commit creds that
the child is not dumpable.  Given it is 'more priv' than its parent.  It
also means the parent cannot ptrace the child and other stupidity.

The solution here:
1) stop hiding capability bits in status
	This makes debugging easier!

2) stop giving any task undefined capability bits.  it's simple, it you
don't put those invalid bits in CAP_FULL_SET you won't get them in init
and you won't get them in any other task either.
	This fixes the cap_issubset() tests and resulting fallout (which
	made the init task in a docker container untraceable among other
	things)

3) mask out undefined bits when sys_capset() is called as it might use
~0, ~0 to denote 'all capabilities' for backward/forward compatibility.
	This lets 'capsh --caps="all=eip" -- -c /bin/bash' run.

4) mask out undefined bit when we read a file capability off of disk as
again likely all bits are set in the xattr for forward/backward
compatibility.
	This lets 'setcap all+pe /bin/bash; /bin/bash' run

Signed-off-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Andrew Vagin <avagin@openvz.org>
Cc: Andrew G. Morgan <morgan@kernel.org>
Cc: Serge E. Hallyn <serge.hallyn@canonical.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Steve Grubb <sgrubb@redhat.com>
Cc: Dan Walsh <dwalsh@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Morris <james.l.morris@oracle.com>
2014-07-24 21:53:47 +10:00