# git rev-parse -q --verify 5f520fc318764df800789edd202b5e3b55130613^{commit} 5f520fc318764df800789edd202b5e3b55130613 already have revision, skipping fetch # git checkout -q -f -B kisskb 5f520fc318764df800789edd202b5e3b55130613 # git clean -qxdf # git log -1 commit 5f520fc318764df800789edd202b5e3b55130613 Merge: 9b95779 4397f04 Author: Linus Torvalds Date: Wed Dec 27 13:06:57 2017 -0800 Merge tag 'trace-v4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull tracing fixes from Steven Rostedt: "While doing tests on tracing over the network, I found that the packets were getting corrupted. In the process I found three bugs. One was the culprit, but the other two scared me. After deeper investigation, they were not as major as I thought they were, due to a signed compared to an unsigned that prevented a negative number from doing actual harm. The two bigger bugs: - Mask the ring buffer data page length. There are data flags at the high bits of the length field. These were not cleared via the length function, and the length could return a negative number. (Although the number returned was unsigned, but was assigned to a signed number) Luckily, this value was compared to PAGE_SIZE which is unsigned and kept it from entering the path that could have caused damage. - Check the page usage before reusing the ring buffer reader page. TCP increments the page ref when passing the page off to the network. The page is passed back to the ring buffer for use on free. But the page could still be in use by the TCP stack. Minor bugs: - Related to the first bug. No need to clear out the unused ring buffer data before sending to user space. It is now done by the ring buffer code itself. - Reset pointers after free on error path. There were some cases in the error path that pointers were freed but not set to NULL, and could have them freed again, having a pointer freed twice" * tag 'trace-v4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix possible double free on failure of allocating trace buffer tracing: Fix crash when it fails to alloc ring buffer ring-buffer: Do no reuse reader page if still in use tracing: Remove extra zeroing out of the ring buffer page ring-buffer: Mask out the info bits when returning buffer page length # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < git log --format=%s --max-count=1 5f520fc318764df800789edd202b5e3b55130613 # < make -j 10 ARCH=sparc O=/home/kisskb/slave/build/linus_sparc-allnoconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allnoconfig # make -j 10 ARCH=sparc O=/home/kisskb/slave/build/linus_sparc-allnoconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- make[1]: Entering directory '/home/kisskb/slave/build/linus_sparc-allnoconfig_sparc64' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config/kernel.release GEN ./Makefile UPD include/config/kernel.release WRAP arch/sparc/include/generated/uapi/asm/bpf_perf_event.h WRAP arch/sparc/include/generated/uapi/asm/types.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h Using /home/kisskb/slave/src as source for kernel WRAP arch/sparc/include/generated/asm/clkdev.h WRAP arch/sparc/include/generated/asm/div64.h WRAP arch/sparc/include/generated/asm/emergency-restart.h WRAP arch/sparc/include/generated/asm/export.h WRAP arch/sparc/include/generated/asm/exec.h WRAP arch/sparc/include/generated/asm/irq_regs.h WRAP arch/sparc/include/generated/asm/irq_work.h WRAP arch/sparc/include/generated/asm/local.h WRAP arch/sparc/include/generated/asm/linkage.h WRAP arch/sparc/include/generated/asm/mcs_spinlock.h WRAP arch/sparc/include/generated/asm/preempt.h WRAP arch/sparc/include/generated/asm/local64.h WRAP arch/sparc/include/generated/asm/mm-arch-hooks.h WRAP arch/sparc/include/generated/asm/module.h WRAP arch/sparc/include/generated/asm/rwsem.h WRAP arch/sparc/include/generated/asm/serial.h WRAP arch/sparc/include/generated/asm/trace_clock.h WRAP arch/sparc/include/generated/asm/word-at-a-time.h CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s CHK scripts/mod/devicetable-offsets.h UPD scripts/mod/devicetable-offsets.h MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o HOSTLD scripts/mod/modpost CC kernel/bounds.s CHK include/generated/timeconst.h UPD include/generated/timeconst.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/sparc/kernel/asm-offsets.s CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o CC init/noinitramfs.o CC init/calibrate.o CC init/init_task.o AR usr/built-in.o AR arch/sparc/crypto/built-in.o CC arch/sparc/math-emu/math_32.o AS arch/sparc/kernel/entry.o UPD include/generated/compile.h CC kernel/fork.o CC kernel/exec_domain.o AR certs/built-in.o AS arch/sparc/kernel/wof.o AS arch/sparc/kernel/wuf.o AS arch/sparc/kernel/etrap_32.o CC arch/sparc/mm/fault_32.o AS arch/sparc/kernel/rtrap_32.o CC arch/sparc/kernel/traps_32.o CC mm/filemap.o CC mm/mempool.o AR arch/sparc/net/built-in.o CC kernel/panic.o CC kernel/cpu.o CC arch/sparc/mm/init_32.o CC arch/sparc/kernel/irq_32.o CC arch/sparc/kernel/sun4m_irq.o CC init/version.o CC kernel/exit.o CC arch/sparc/mm/extable.o AR init/mounts.o AR init/built-in.o CC arch/sparc/kernel/sun4d_irq.o CC arch/sparc/kernel/process_32.o CC kernel/softirq.o CC arch/sparc/mm/srmmu.o CC arch/sparc/mm/iommu.o CC arch/sparc/kernel/signal_32.o CC arch/sparc/kernel/sigutil_32.o CC kernel/resource.o CC arch/sparc/kernel/ioport.o CC mm/oom_kill.o CC arch/sparc/mm/io-unit.o CC arch/sparc/kernel/setup_32.o CC fs/open.o CC fs/read_write.o CC kernel/sysctl.o AS arch/sparc/mm/srmmu_access.o AS arch/sparc/mm/hypersparc.o CC arch/sparc/kernel/idprom.o CC fs/file_table.o AS arch/sparc/mm/viking.o AR ipc/built-in.o AS arch/sparc/mm/tsunami.o CC security/commoncap.o AS arch/sparc/mm/swift.o CC mm/maccess.o CC arch/sparc/mm/leon_mm.o AR crypto/built-in.o CC security/min_addr.o AR arch/sparc/math-emu/built-in.o CC mm/page_alloc.o CC kernel/sysctl_binary.o CC arch/sparc/mm/highmem.o CC arch/sparc/kernel/sys_sparc_32.o AS arch/sparc/kernel/systbls_32.o CC fs/super.o CC kernel/capability.o CC kernel/ptrace.o AR arch/sparc/mm/built-in.o CC kernel/user.o CC fs/char_dev.o AR security/built-in.o CC kernel/signal.o CC arch/sparc/kernel/time_32.o AR block/built-in.o CC kernel/sys.o CC fs/stat.o CC arch/sparc/kernel/windows.o CC arch/sparc/kernel/cpu.o CC arch/sparc/kernel/devices.o CC arch/sparc/kernel/ptrace_32.o CC arch/sparc/kernel/unaligned_32.o CC kernel/umh.o CC kernel/workqueue.o CC kernel/pid.o CC kernel/task_work.o CC fs/exec.o CC fs/pipe.o AS arch/sparc/kernel/una_asm_32.o CC arch/sparc/kernel/prom_common.o CC arch/sparc/kernel/prom_32.o CC mm/page-writeback.o CC mm/readahead.o CC fs/namei.o CC arch/sparc/kernel/of_device_common.o CC kernel/extable.o CC kernel/params.o CC fs/fcntl.o CC mm/swap.o CC arch/sparc/kernel/of_device_32.o CC arch/sparc/kernel/leon_kernel.o CC mm/truncate.o CC mm/vmscan.o CC mm/shmem.o CC mm/util.o CC kernel/kthread.o CC arch/sparc/kernel/leon_pmc.o AR drivers/amba/built-in.o AR drivers/auxdisplay/built-in.o CC drivers/base/component.o CC fs/ioctl.o CC arch/sparc/kernel/dma.o CC arch/sparc/kernel/auxio_32.o AR drivers/block/built-in.o AR sound/built-in.o CC mm/mmzone.o AR firmware/built-in.o AR net/built-in.o CC lib/lockref.o CC lib/bcd.o CC drivers/base/core.o CC drivers/base/bus.o CC kernel/sys_ni.o CC lib/div64.o AR drivers/bus/built-in.o CC drivers/base/dd.o CC kernel/nsproxy.o CC kernel/notifier.o CC arch/sparc/kernel/apc.o CC kernel/ksysfs.o CC lib/sort.o CC lib/parser.o CC arch/sparc/kernel/pmc.o CC fs/readdir.o AS arch/sparc/kernel/head_32.o CC mm/vmstat.o CC arch/sparc/prom/bootstr_32.o CC arch/sparc/prom/console_32.o CC lib/debug_locks.o CC kernel/cred.o CC lib/random32.o CC kernel/reboot.o CC lib/bust_spinlocks.o LDS arch/sparc/kernel/vmlinux.lds AR arch/sparc/kernel/built-in.o CC drivers/base/syscore.o AR arch/sparc/built-in.o CC arch/sparc/prom/init_32.o CC arch/sparc/lib/atomic32.o CC drivers/base/driver.o CC mm/backing-dev.o AR virt/lib/built-in.o AR virt/built-in.o AR drivers/cdrom/built-in.o CC lib/kasprintf.o CC lib/bitmap.o CC drivers/char/mem.o AR drivers/char/ipmi/built-in.o CC fs/select.o CC fs/dcache.o CC arch/sparc/lib/ucmpdi2.o CC arch/sparc/prom/memory.o CC kernel/async.o CC kernel/range.o CC drivers/base/class.o CC mm/mm_init.o AS arch/sparc/lib/ashldi3.o AS arch/sparc/lib/ashrdi3.o CC arch/sparc/prom/misc_32.o CC arch/sparc/lib/bitext.o CC lib/scatterlist.o CC lib/gcd.o CC kernel/smpboot.o CC kernel/ucount.o AS arch/sparc/lib/blockops.o AS arch/sparc/lib/checksum_32.o CC arch/sparc/prom/mp.o CC arch/sparc/lib/cmpdi2.o CC drivers/base/platform.o CC drivers/char/random.o CC mm/mmu_context.o CC mm/percpu.o AS arch/sparc/lib/copy_user.o CC arch/sparc/prom/printf.o AS arch/sparc/lib/divdi3.o AS arch/sparc/lib/locks.o AS arch/sparc/lib/lshrdi3.o AS arch/sparc/lib/memcmp.o AS arch/sparc/lib/memcpy.o CC lib/lcm.o AS arch/sparc/lib/memscan_32.o CC lib/list_sort.o AS arch/sparc/lib/memset.o AS arch/sparc/lib/muldi3.o CC kernel/irq/irqdesc.o CC drivers/char/misc.o AS arch/sparc/lib/strlen.o AS arch/sparc/lib/strncmp_32.o CC lib/uuid.o AS arch/sparc/lib/udivdi3.o AR arch/sparc/lib/lib.a CC arch/sparc/prom/ranges.o EXPORTS arch/sparc/lib/lib-ksyms.o AR arch/sparc/lib/built-in.o CC fs/inode.o CC lib/flex_array.o CC drivers/base/cpu.o CC drivers/base/firmware.o CC drivers/base/init.o CC arch/sparc/prom/tree_32.o AR drivers/char/agp/built-in.o AR drivers/char/built-in.o CC kernel/irq/handle.o CC fs/attr.o CC kernel/irq/manage.o CC lib/iov_iter.o CC kernel/irq/spurious.o CC kernel/irq/resend.o CC drivers/base/map.o CC kernel/irq/chip.o AR arch/sparc/prom/lib.a EXPORTS arch/sparc/prom/lib-ksyms.o CC kernel/irq/dummychip.o CC mm/slab_common.o CC fs/bad_inode.o AR arch/sparc/prom/built-in.o CC drivers/base/devres.o AR drivers/clk/bcm/built-in.o AR drivers/clk/imgtec/built-in.o AR drivers/clk/mvebu/built-in.o AR drivers/clocksource/built-in.o CC mm/compaction.o AR drivers/clk/renesas/built-in.o AR drivers/clk/ti/built-in.o AR drivers/clk/built-in.o CC mm/vmacache.o CC mm/swap_slots.o CC mm/interval_tree.o CC drivers/base/attribute_container.o AR drivers/firewire/built-in.o CC fs/file.o AR drivers/hwtracing/intel_th/built-in.o AR drivers/firmware/broadcom/built-in.o AR drivers/gpu/drm/amd/lib/built-in.o AR drivers/firmware/meson/built-in.o AR drivers/gpu/drm/bridge/synopsys/built-in.o AR drivers/firmware/tegra/built-in.o CC kernel/irq/devres.o AR drivers/gpu/drm/bridge/built-in.o AR drivers/firmware/built-in.o AR kernel/livepatch/built-in.o AR drivers/idle/built-in.o AR drivers/gpu/drm/hisilicon/built-in.o AR drivers/i2c/algos/built-in.o AR drivers/gpu/drm/i2c/built-in.o AR drivers/i2c/busses/built-in.o AR drivers/gpu/drm/omapdrm/displays/built-in.o AR drivers/i2c/muxes/built-in.o AR drivers/gpu/drm/omapdrm/dss/built-in.o CC lib/clz_ctz.o AR drivers/i2c/built-in.o AR drivers/gpu/drm/omapdrm/built-in.o CC mm/list_lru.o AR drivers/gpu/drm/panel/built-in.o AR drivers/gpu/drm/tilcdc/built-in.o CC drivers/base/transport_class.o AR drivers/gpu/drm/built-in.o CC drivers/base/topology.o AR drivers/gpu/vga/built-in.o AR drivers/gpu/built-in.o CC kernel/locking/mutex.o CC kernel/locking/semaphore.o CC fs/filesystems.o CC fs/namespace.o AR kernel/irq/built-in.o CC fs/seq_file.o CC lib/bsearch.o CC lib/find_bit.o CC mm/workingset.o CC lib/llist.o CC lib/memweight.o CC drivers/base/container.o CC lib/kfifo.o CC lib/percpu-refcount.o AR drivers/irqchip/built-in.o CC mm/debug.o CC lib/percpu_ida.o CC kernel/locking/rwsem.o CC drivers/base/property.o CC drivers/base/cacheinfo.o CC fs/xattr.o CC fs/libfs.o CC fs/fs-writeback.o CC kernel/locking/percpu-rwsem.o CC mm/gup.o CC kernel/locking/rwsem-spinlock.o CC lib/rhashtable.o CC lib/reciprocal_div.o CC kernel/power/qos.o AR kernel/locking/built-in.o CC fs/pnode.o AR drivers/macintosh/built-in.o CC mm/highmem.o AR drivers/media/common/b2c2/built-in.o AR drivers/media/common/saa7146/built-in.o AR drivers/media/common/siano/built-in.o AR drivers/media/common/v4l2-tpg/built-in.o AR drivers/media/common/built-in.o AR drivers/media/firewire/built-in.o AR drivers/media/i2c/soc_camera/built-in.o AR drivers/media/i2c/built-in.o AR drivers/media/mmc/siano/built-in.o AR drivers/media/mmc/built-in.o AR drivers/media/pci/b2c2/built-in.o AR drivers/media/pci/ddbridge/built-in.o AR drivers/media/platform/blackfin/built-in.o AR drivers/media/pci/dm1105/built-in.o AR drivers/media/platform/davinci/built-in.o AR drivers/media/pci/mantis/built-in.o AR drivers/media/platform/meson/built-in.o AR drivers/media/pci/netup_unidvb/built-in.o AR drivers/media/platform/omap/built-in.o CC fs/splice.o AR drivers/media/pci/ngene/built-in.o AR drivers/media/platform/stm32/built-in.o AR drivers/media/platform/built-in.o AR drivers/media/pci/pluto2/built-in.o AR drivers/media/pci/pt1/built-in.o AR drivers/media/pci/pt3/built-in.o CC fs/sync.o AR drivers/media/pci/saa7146/built-in.o AR drivers/media/pci/smipcie/built-in.o CC kernel/printk/printk.o AR drivers/media/pci/ttpci/built-in.o AR drivers/media/pci/built-in.o AR drivers/media/rc/keymaps/built-in.o AR drivers/media/rc/built-in.o AR drivers/media/spi/built-in.o AR drivers/base/power/built-in.o AR drivers/media/tuners/built-in.o AR kernel/power/built-in.o AR drivers/media/usb/b2c2/built-in.o AR drivers/base/test/built-in.o CC drivers/base/dma-mapping.o AR drivers/media/usb/dvb-usb/built-in.o AR drivers/mfd/built-in.o AR drivers/media/usb/dvb-usb-v2/built-in.o AR drivers/media/usb/s2255/built-in.o CC lib/once.o AR drivers/media/usb/siano/built-in.o AR drivers/media/usb/stkwebcam/built-in.o AR drivers/media/usb/ttusb-budget/built-in.o AR drivers/media/usb/ttusb-dec/built-in.o AR drivers/media/usb/zr364xx/built-in.o AR drivers/media/usb/built-in.o CC fs/utimes.o AR drivers/media/built-in.o CC fs/stack.o CC lib/refcount.o CC mm/memory.o CC mm/mincore.o CC mm/mlock.o CC mm/mmap.o CC lib/usercopy.o AR drivers/misc/cb710/built-in.o AR drivers/misc/eeprom/built-in.o AR drivers/misc/lis3lv02d/built-in.o AR drivers/misc/mic/bus/built-in.o AR drivers/base/built-in.o AR drivers/misc/mic/built-in.o CC fs/fs_struct.o AR drivers/misc/ti-st/built-in.o CC lib/errseq.o AR drivers/misc/built-in.o AR drivers/mmc/built-in.o CC lib/string_helpers.o AR drivers/net/phy/built-in.o AR drivers/net/built-in.o AR drivers/nfc/built-in.o AR kernel/printk/built-in.o AR drivers/nvme/host/built-in.o CC kernel/rcu/update.o AR drivers/nvme/target/built-in.o AR drivers/nvme/built-in.o CC drivers/of/base.o CC kernel/sched/core.o CC kernel/sched/loadavg.o CC kernel/sched/clock.o CC fs/statfs.o CC kernel/sched/cputime.o CC kernel/rcu/sync.o CC kernel/time/time.o CC kernel/dma.o CC lib/hexdump.o CC kernel/rcu/tiny.o CC drivers/of/device.o CC fs/fs_pin.o CC fs/nsfs.o CC lib/kstrtox.o CC mm/mprotect.o CC drivers/of/platform.o AR kernel/rcu/built-in.o CC mm/mremap.o CC mm/msync.o CC fs/no-block.o CC lib/pci_iomap.o CC mm/page_vma_mapped.o CC kernel/time/timer.o CC drivers/of/property.o AR drivers/pci/dwc/built-in.o CC mm/pagewalk.o AR fs/devpts/built-in.o AR fs/exofs/built-in.o AR fs/notify/dnotify/built-in.o AR fs/notify/fanotify/built-in.o AR fs/notify/inotify/built-in.o AR fs/notify/built-in.o CC kernel/up.o AR fs/quota/built-in.o CC fs/ramfs/inode.o CC kernel/sched/idle_task.o CC kernel/sched/fair.o CC lib/iomap_copy.o CC lib/devres.o CC lib/hweight.o CC lib/syscall.o CC mm/pgtable-generic.o CC kernel/memremap.o CC lib/atomic64.o CC lib/strncpy_from_user.o CC mm/rmap.o CC fs/ramfs/file-mmu.o CC kernel/sched/rt.o CC drivers/of/pdt.o CC kernel/time/hrtimer.o CC lib/strnlen_user.o CC kernel/time/timekeeping.o CC mm/vmalloc.o AR drivers/platform/built-in.o CC kernel/time/ntp.o CC lib/argv_split.o AR drivers/of/built-in.o AR drivers/power/built-in.o AR drivers/ptp/built-in.o AR fs/ramfs/ramfs.o AR drivers/pwm/built-in.o AR fs/ramfs/built-in.o AR fs/built-in.o CC drivers/rtc/rtc-lib.o CC drivers/rtc/systohc.o CC drivers/rtc/class.o CC lib/chacha20.o CC kernel/sched/deadline.o CC lib/clz_tab.o CC mm/init-mm.o CC kernel/sched/wait.o CC kernel/sched/wait_bit.o CC lib/cmdline.o AR drivers/sbus/char/built-in.o AR drivers/sbus/built-in.o CC kernel/sched/swait.o CC lib/ctype.o CC drivers/rtc/interface.o CC kernel/time/clocksource.o CC lib/dec_and_lock.o CC lib/decompress.o AR drivers/soc/bcm/built-in.o AR drivers/soc/fsl/built-in.o AR drivers/soc/mediatek/built-in.o AR drivers/soc/renesas/built-in.o CC kernel/sched/completion.o AR drivers/soc/built-in.o CC lib/dump_stack.o CC kernel/time/jiffies.o CC mm/bootmem.o CC kernel/sched/idle.o AR drivers/tty/ipwireless/built-in.o AR drivers/tty/serial/built-in.o AR drivers/tty/vt/built-in.o AR drivers/tty/built-in.o CC lib/earlycpio.o CC lib/extable.o AR drivers/usb/built-in.o CC drivers/rtc/rtc-m48t59.o CC lib/flex_proportions.o CC lib/idr.o CC lib/int_sqrt.o CC lib/ioremap.o CC lib/irq_regs.o CC kernel/time/timer_list.o CC mm/dmapool.o AR drivers/video/backlight/built-in.o AR drivers/video/fbdev/core/built-in.o CC lib/is_single_threaded.o AR kernel/sched/built-in.o AR drivers/video/fbdev/omap2/omapfb/displays/built-in.o AR drivers/video/fbdev/omap2/omapfb/dss/built-in.o CC lib/klist.o CC mm/slub.o CC lib/kobject.o AR drivers/video/fbdev/omap2/omapfb/built-in.o AR drivers/video/fbdev/omap2/built-in.o AR drivers/video/fbdev/built-in.o AR drivers/video/built-in.o CC lib/kobject_uevent.o CC kernel/time/timeconv.o CC lib/nmi_backtrace.o CC kernel/time/timecounter.o AR drivers/rtc/rtc-core.o AR drivers/rtc/built-in.o AR drivers/built-in.o CC kernel/time/alarmtimer.o CC kernel/time/posix-stubs.o CC kernel/time/clockevents.o CC lib/nodemask.o CC kernel/time/tick-common.o CC lib/plist.o CC lib/radix-tree.o CC lib/ratelimit.o CC lib/rbtree.o CC lib/seq_buf.o CC lib/sha1.o CC lib/show_mem.o CC lib/siphash.o CC lib/string.o CC lib/timerqueue.o CC lib/vsprintf.o AR kernel/time/built-in.o CC lib/win_minmax.o AR kernel/built-in.o AR mm/built-in.o AR lib/lib.a EXPORTS lib/lib-ksyms.o AR lib/built-in.o GEN .version CHK include/generated/compile.h AR built-in.o LD vmlinux.o MODPOST vmlinux.o LD vmlinux SYSMAP System.map STRIP arch/sparc/boot/image kernel: arch/sparc/boot/image is ready STRIP arch/sparc/boot/zImage kernel: arch/sparc/boot/zImage is ready make[1]: Leaving directory '/home/kisskb/slave/build/linus_sparc-allnoconfig_sparc64' Completed OK # rm -rf /home/kisskb/slave/build/linus_sparc-allnoconfig_sparc64 # Build took: 0:00:15.437214