Merge android-4.19-stable.149 (9ce79d9) into msm-4.19
* refs/heads/tmp-9ce79d9: Linux 4.19.149 KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch ata: sata_mv, avoid trigerrable BUG_ON ata: make qc_prep return ata_completion_errors ata: define AC_ERR_OK kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl mm, THP, swap: fix allocating cluster for swapfile by mistake kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() s390/dasd: Fix zero write for FBA devices tracing: fix double free KVM: SVM: Add a dedicated INVD intercept routine KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() regmap: fix page selection for noinc reads ALSA: asihpi: fix iounmap in error handler bpf: Fix a rcu warning for bpffs map pretty-print batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: Add missing include for in_interrupt() drm/sun4i: sun8i-csc: Secondary CSC register correction net: qed: RDMA personality shouldn't fail VF load drm/vc4/vc4_hdmi: fill ASoC card owner bpf: Fix clobbering of r2 in bpf_gen_ld_abs mac802154: tx: fix use-after-free batman-adv: mcast/TT: fix wrongly dropped or rerouted packets atm: eni: fix the missed pci_disable_device() for eni_init_one() batman-adv: bla: fix type misuse for backbone_gw hash indexing mwifiex: Increase AES key storage size to 256 bits clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() ieee802154/adf7242: check status of adf7242_read_reg ieee802154: fix one possible memleak in ca8210_dev_com_init objtool: Fix noreturn detection for ignored functions i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() drm/amdkfd: fix a memory leak issue lockdep: fix order in trace_hardirqs_off_caller() s390/init: add missing __init annotations RISC-V: Take text_mutex in ftrace_init_nop() ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1 ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811 nvme: explicitly update mpath disk capacity on revalidation net: openvswitch: use div_u64() for 64-by-32 divisions perf parse-events: Use strcmp() to compare the PMU name ubi: fastmap: Free unused fastmap anchor peb during detach btrfs: qgroup: fix data leak caused by race between writeback and truncate vfio/pci: fix racy on error and request eventfd ctx selftests/x86/syscall_nt: Clear weird flags after each test scsi: libfc: Skip additional kref updating work event scsi: libfc: Handling of extra kref nvme: fix possible deadlock when I/O is blocked cifs: Fix double add page to memcg when cifs_readpages vfio/pci: Clear error and request eventfd ctx after releasing x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline mtd: parser: cmdline: Support MTD names containing one or more colons rapidio: avoid data race between file operation callbacks and mport_cdev_add(). mm/swap_state: fix a data race in swapin_nr_pages ceph: fix potential race in ceph_check_caps PCI: tegra: Fix runtime PM imbalance on error mtd: rawnand: omap_elm: Fix runtime PM imbalance on error wlcore: fix runtime pm imbalance in wlcore_regdomain_config wlcore: fix runtime pm imbalance in wl1271_tx_work ASoC: img-i2s-out: Fix runtime PM imbalance on error perf kcore_copy: Fix module map when there are no modules loaded perf metricgroup: Free metric_events on error perf util: Fix memory leak of prefix_if_not_in perf stat: Fix duration_time value for higher intervals perf trace: Fix the selection for architectures to generate the errno name tables perf evsel: Fix 2 memory leaks vfio/pci: fix memory leaks of eventfd ctx btrfs: don't force read-only after error in drop snapshot usb: dwc3: Increase timeout for CmdAct cleared by device controller printk: handle blank console arguments passed in. drm/nouveau/dispnv50: fix runtime pm imbalance on error drm/nouveau: fix runtime pm imbalance on error drm/nouveau/debugfs: fix runtime pm imbalance on error e1000: Do not perform reset in reset_task if we are already down arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register scsi: cxlflash: Fix error return code in cxlflash_probe() USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int fuse: don't check refcount after stealing page powerpc/traps: Make unrecoverable NMIs die instead of panic ALSA: hda: Fix potential race in unsol event handler tty: serial: samsung: Correct clock selection logic tipc: fix memory leak in service subscripting USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Bluetooth: Handle Inquiry Cancel error after Inquiry Complete phy: samsung: s5pv210-usb2: Add delay after reset power: supply: max17040: Correct voltage reading perf mem2node: Avoid double free related to realloc atm: fix a memory leak of vcc->user_back dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] sparc64: vcc: Fix error return code in vcc_probe() staging:r8188eu: avoid skb_clone for amsdu to msdu conversion scsi: aacraid: Fix error handling paths in aac_probe_one() net: openvswitch: use u64 for meter bucket KVM: arm64: vgic-its: Fix memory leak on the error path of vgic_add_lpi() drivers: char: tlclk.c: Avoid data race between init and interrupt handler bdev: Reduce time holding bd_mutex in sync in blkdev_close() KVM: Remove CREATE_IRQCHIP/SET_PIT2 race serial: uartps: Wait for tx_empty in console setup scsi: qedi: Fix termination timeouts in session logout mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area nvmet-rdma: fix double free of rdma queue mm/vmscan.c: fix data races using kswapd_classzone_idx mm/filemap.c: clear page error before actual read mm/kmemleak.c: use address-of operator on section symbols NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() PCI: pciehp: Fix MSI interrupt race ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len PCI: Use ioremap(), not phys_to_virt() for platform ROM svcrdma: Fix leak of transport addresses SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' scsi: hpsa: correct race condition in offload enabled RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices nvme: Fix controller creation races with teardown flow nvme-multipath: do not reset on unknown status tools: gpio-hammer: Avoid potential overflow in main cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn perf cpumap: Fix snprintf overflow check serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout serial: 8250_omap: Fix sleeping function called from invalid context during probe serial: 8250_port: Don't service RX FIFO if throttled perf parse-events: Fix 3 use after frees found with clang ASAN thermal: rcar_thermal: Handle probe error gracefully tracing: Use address-of operator on section symbols drm/msm/a5xx: Always set an OPP supported hardware value drm/msm: fix leaks if initialization fails KVM: PPC: Book3S HV: Treat TM-related invalid form instructions on P9 like the valid ones RDMA/cm: Remove a race freeing timewait_info nfsd: Don't add locks to closed or closing open stateids rtc: ds1374: fix possible race condition rtc: sa1100: fix possible race condition tpm: ibmvtpm: Wait for buffer to be set before proceeding ext4: mark block bitmap corrupted when found instead of BUGON xfs: mark dir corrupt when lookup-by-hash fails xfs: don't ever return a stale pointer from __xfs_dir3_free_read media: tda10071: fix unsigned sign extension overflow Bluetooth: L2CAP: handle l2cap config request during open state scsi: aacraid: Disabling TM path and only processing IOP reset ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read drm/amd/display: Stop if retimer is not available drm/amdgpu: increase atombios cmd timeout mm: avoid data corruption on CoW fault into PFN-mapped VMA perf jevents: Fix leak of mapfile memory ext4: fix a data race at inode->i_disksize timekeeping: Prevent 32bit truncation in scale64_check_overflow() Bluetooth: guard against controllers sending zero'd events media: go7007: Fix URB type for interrupt handling bus: hisi_lpc: Fixup IO ports addresses to avoid use-after-free in host removal random: fix data races at timer_rand_state firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp drm/amd/display: dal_ddc_i2c_payloads_create can fail causing panic dmaengine: tegra-apb: Prevent race conditions on channel's freeing dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all bpf: Remove recursion prevention from rcu free callback x86/pkeys: Add check for pkey "overflow" media: staging/imx: Missing assignment in imx_media_capture_device_register() dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all KVM: x86: fix incorrect comparison in trace event RDMA/rxe: Fix configuration of atomic queue pair attributes perf test: Fix test trace+probe_vfs_getname.sh on s390 ALSA: usb-audio: Don't create a mixer element with bogus volume range mt76: clear skb pointers from rx aggregation reorder buffer during cleanup crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test clk: stratix10: use do_div() for 64-bit calculation drm/omap: fix possible object reference leak scsi: lpfc: Fix coverity errors in fmdi attribute handling scsi: lpfc: Fix RQ buffer leakage when no IOCBs available selinux: sel_avc_get_stat_idx should increase position index audit: CONFIG_CHANGE don't log internal bookkeeping as an event skbuff: fix a data race in skb_queue_len() ALSA: hda: Clear RIRB status before reading WP KVM: fix overflow of zero page refcount with ksm running Bluetooth: prefetch channel before killing sock mm: pagewalk: fix termination condition in walk_pte_range() mm/swapfile.c: swap_next should increase position index Bluetooth: Fix refcount use-after-free issue tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility selftests/ftrace: fix glob selftest ceph: ensure we have a new cap before continuing in fill_inode ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter ARM: 8948/1: Prevent OOB access in stacktrace tracing: Set kernel_stack's caller size properly Bluetooth: btrtl: Use kvmalloc for FW allocations powerpc/eeh: Only dump stack once if an MMIO loop is detected s390/cpum_sf: Use kzalloc and minor changes dmaengine: zynqmp_dma: fix burst length configuration scsi: ufs: Fix a race condition in the tracing code scsi: ufs: Make ufshcd_add_command_trace() easier to read ACPI: EC: Reference count query handlers under lock sctp: move trace_sctp_probe_path into sctp_outq_sack media: ti-vpe: cal: Restrict DMA to avoid memory corruption seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier ipv6_route_seq_next should increase position index rt_cpu_seq_next should increase position index neigh_stat_seq_next() should increase position index xfs: fix log reservation overflows when allocating large rt extents KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy() kernel/sys.c: avoid copying possible padding bytes in copy_to_user ASoC: max98090: remove msleep in PLL unlocked workaround CIFS: Properly process SMB3 lease breaks debugfs: Fix !DEBUG_FS debugfs_create_automount scsi: pm80xx: Cleanup command when a reset times out gfs2: clean up iopen glock mess in gfs2_create_inode mmc: core: Fix size overflow for mmc partitions ubi: Fix producing anchor PEBs RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' xfs: fix attr leaf header freemap.size underflow fix dget_parent() fastpath race RDMA/i40iw: Fix potential use after free RDMA/qedr: Fix potential use after free dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails bcache: fix a lost wake-up problem caused by mca_cannibalize_lock tracing: Adding NULL checks for trace_array descriptor pointer tpm_crb: fix fTPM on AMD Zen+ CPUs drm/amdgpu/powerplay/smu7: fix AVFS handling with custom powerplay table mfd: mfd-core: Protect against NULL call-back function pointer mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table clk/ti/adpll: allocate room for terminating null net: silence data-races on sk_backlog.tail scsi: lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce scsi: fnic: fix use after free PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out leds: mlxreg: Fix possible buffer overflow lib/string.c: implement stpcpy ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged ALSA: usb-audio: Add delay quirk for H570e USB headsets x86/ioapic: Unbreak check_timer() arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback media: smiapp: Fix error handling at NVM reading ASoC: kirkwood: fix IRQ error handling gma/gma500: fix a memory disclosure bug due to uninitialized bytes m68k: q40: Fix info-leak in rtc_ioctl scsi: aacraid: fix illegal IO beyond last LBA mm: fix double page fault on arm64 if PTE_AF is cleared ath10k: fix memory leak for tpc_stats_final ath10k: fix array out-of-bounds access dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling) media: mc-device.c: fix memleak in media_device_register_entity selinux: allow labeling before policy is loaded ANDROID: GKI: prevent removal of monitored symbols ANDROID: Refresh ABI.xmls with libabigail 1.8.0-98bbf30d Linux 4.19.148 serial: 8250: Avoid error message on reprobe tcp_bbr: adapt cwnd based on ack aggregation estimation tcp_bbr: refactor bbr_target_cwnd() for general inflight provisioning mm: memcg: fix memcg reclaim soft lockup kbuild: support LLVM=1 to switch the default tools to Clang/LLVM kbuild: replace AS=clang with LLVM_IAS=1 kbuild: remove AS variable x86/boot: kbuild: allow readelf executable to be specified net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware Documentation/llvm: fix the name of llvm-size Documentation/llvm: add documentation on building w/ Clang/LLVM kbuild: add OBJSIZE variable for the size tool MAINTAINERS: add CLANG/LLVM BUILD SUPPORT info ipv4: Update exception handling for multipath routes via same device net: add __must_check to skb_put_padto() net: qrtr: check skb_put_padto() return value net: phy: Avoid NPD upon phy_detach() when driver is unbound bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. bnxt_en: return proper error codes in bnxt_show_temp tipc: use skb_unshare() instead in tipc_buf_append() tipc: fix shutdown() of connection oriented socket tipc: Fix memory leak in tipc_group_create_member() nfp: use correct define to return NONE fec net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC net: dsa: rtl8366: Properly clear member config net: DCB: Validate DCB_ATTR_DCB_BUFFER argument ipv6: avoid lockdep issue in fib6_del() ip: fix tos reflection in ack and reset packets hdlc_ppp: add range checks in ppp_cp_parse_cr() geneve: add transport ports in route lookup for geneve cxgb4: Fix offset when clearing filter byte counters mm/thp: fix __split_huge_pmd_locked() for migration PMD kprobes: fix kill kprobe which has been marked as gone KVM: fix memory leak in kvm_io_bus_unregister_dev() af_key: pfkey_dump needs parameter validation ANDROID: drop KERNEL_DIR setting in build.config.common Linux 4.19.147 x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y powerpc/dma: Fix dma_map_ops::get_required_mask ehci-hcd: Move include to keep CRC stable x86/boot/compressed: Disable relocation relaxation serial: 8250_pci: Add Realtek 816a and 816b Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists Input: trackpoint - add new trackpoint variant IDs percpu: fix first chunk size calculation for populated bitmap Revert "ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO" i2c: i801: Fix resume bug usblp: fix race between disconnect() and read() USB: UAS: fix disconnect by unplugging a hub USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook drm/mediatek: Add missing put_device() call in mtk_hdmi_dt_parse_pdata() drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail MIPS: SNI: Fix spurious interrupts fbcon: Fix user font detection test at fbcon_resize(). perf test: Free formats for perf pmu parse test MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT perf test: Fix the "signal" test inline assembly Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload ASoC: qcom: Set card->owner to avoid warnings clk: rockchip: Fix initialization of mux_pll_src_4plls_p clk: davinci: Use the correct size when allocating memory KVM: MIPS: Change the definition of kvm type spi: Fix memory leak on splited transfers i2c: algo: pca: Reapply i2c bus settings after reset f2fs: Return EOF on unaligned end of file DIO read f2fs: fix indefinite loop scanning for free nid nvme-rdma: cancel async events before freeing event struct nvme-fc: cancel async events before freeing event struct openrisc: Fix cache API compile issue when not inlining rapidio: Replace 'select' DMAENGINES 'with depends on' SUNRPC: stop printk reading past end of string NFS: Zero-stateid SETATTR should first return delegation spi: spi-loopback-test: Fix out-of-bounds read regulator: pwm: Fix machine constraints application scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery scsi: libfc: Fix for double free() scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall hv_netvsc: Remove "unlikely" from netvsc_select_queue net: handle the return value of pskb_carve_frag_list() correctly RDMA/bnxt_re: Restrict the max_gids to 256 gfs2: initialize transaction tr_ailX_lists earlier scsi: qla2xxx: Reduce holding sess_lock to prevent CPU lock-up scsi: qla2xxx: Move rport registration out of internal work_list scsi: qla2xxx: Update rscn_rcvd field to more meaningful scan_needed dsa: Allow forwarding of redirected IGMP traffic ANDROID: Refresh ABI.xmls with libabigail 1.8.0-1dca710a ANDROID: KMI symbol lists: migrate section name Conflicts: Documentation/devicetree/bindings Documentation/devicetree/bindings/sound/wm8994.txt Makefile drivers/scsi/ufs/ufshcd.c drivers/usb/dwc3/gadget.c mm/memory.c net/qrtr/qrtr.c Change-Id: I51d2167f5b2aca5ff0e50a5399d6c13b7a9a7e64 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
This commit is contained in:
Srinivasarao P
@@ -317,8 +317,6 @@ static void audit_update_watch(struct audit_parent *parent,
|
||||
if (oentry->rule.exe)
|
||||
audit_remove_mark(oentry->rule.exe);
|
||||
|
||||
audit_watch_log_rule_change(r, owatch, "updated_rules");
|
||||
|
||||
call_rcu(&oentry->rcu, audit_free_rule_rcu);
|
||||
}
|
||||
|
||||
|
||||
@@ -667,15 +667,7 @@ static void htab_elem_free_rcu(struct rcu_head *head)
|
||||
struct htab_elem *l = container_of(head, struct htab_elem, rcu);
|
||||
struct bpf_htab *htab = l->htab;
|
||||
|
||||
/* must increment bpf_prog_active to avoid kprobe+bpf triggering while
|
||||
* we're calling kfree, otherwise deadlock is possible if kprobes
|
||||
* are placed somewhere inside of slub
|
||||
*/
|
||||
preempt_disable();
|
||||
__this_cpu_inc(bpf_prog_active);
|
||||
htab_elem_free(htab, l);
|
||||
__this_cpu_dec(bpf_prog_active);
|
||||
preempt_enable();
|
||||
}
|
||||
|
||||
static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l)
|
||||
|
||||
@@ -207,10 +207,12 @@ static void *map_seq_next(struct seq_file *m, void *v, loff_t *pos)
|
||||
else
|
||||
prev_key = key;
|
||||
|
||||
rcu_read_lock();
|
||||
if (map->ops->map_get_next_key(map, prev_key, key)) {
|
||||
map_iter(m)->done = true;
|
||||
return NULL;
|
||||
key = NULL;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
return key;
|
||||
}
|
||||
|
||||
|
||||
@@ -1065,9 +1065,20 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
|
||||
return ret;
|
||||
}
|
||||
#else /* !CONFIG_KPROBES_ON_FTRACE */
|
||||
#define prepare_kprobe(p) arch_prepare_kprobe(p)
|
||||
#define arm_kprobe_ftrace(p) (-ENODEV)
|
||||
#define disarm_kprobe_ftrace(p) (-ENODEV)
|
||||
static inline int prepare_kprobe(struct kprobe *p)
|
||||
{
|
||||
return arch_prepare_kprobe(p);
|
||||
}
|
||||
|
||||
static inline int arm_kprobe_ftrace(struct kprobe *p)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static inline int disarm_kprobe_ftrace(struct kprobe *p)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Arm a kprobe with text_mutex */
|
||||
@@ -2061,6 +2072,9 @@ static void kill_kprobe(struct kprobe *p)
|
||||
{
|
||||
struct kprobe *kp;
|
||||
|
||||
if (WARN_ON_ONCE(kprobe_gone(p)))
|
||||
return;
|
||||
|
||||
p->flags |= KPROBE_FLAG_GONE;
|
||||
if (kprobe_aggrprobe(p)) {
|
||||
/*
|
||||
@@ -2080,9 +2094,10 @@ static void kill_kprobe(struct kprobe *p)
|
||||
|
||||
/*
|
||||
* The module is going away. We should disarm the kprobe which
|
||||
* is using ftrace.
|
||||
* is using ftrace, because ftrace framework is still available at
|
||||
* MODULE_STATE_GOING notification.
|
||||
*/
|
||||
if (kprobe_ftrace(p))
|
||||
if (kprobe_ftrace(p) && !kprobe_disabled(p) && !kprobes_all_disarmed)
|
||||
disarm_kprobe_ftrace(p);
|
||||
}
|
||||
|
||||
@@ -2243,7 +2258,10 @@ static int kprobes_module_callback(struct notifier_block *nb,
|
||||
mutex_lock(&kprobe_mutex);
|
||||
for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
|
||||
head = &kprobe_table[i];
|
||||
hlist_for_each_entry_rcu(p, head, hlist)
|
||||
hlist_for_each_entry_rcu(p, head, hlist) {
|
||||
if (kprobe_gone(p))
|
||||
continue;
|
||||
|
||||
if (within_module_init((unsigned long)p->addr, mod) ||
|
||||
(checkcore &&
|
||||
within_module_core((unsigned long)p->addr, mod))) {
|
||||
@@ -2260,6 +2278,7 @@ static int kprobes_module_callback(struct notifier_block *nb,
|
||||
*/
|
||||
kill_kprobe(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
mutex_unlock(&kprobe_mutex);
|
||||
return NOTIFY_DONE;
|
||||
|
||||
@@ -2150,6 +2150,9 @@ static int __init console_setup(char *str)
|
||||
char *s, *options, *brl_options = NULL;
|
||||
int idx;
|
||||
|
||||
if (str[0] == 0)
|
||||
return 1;
|
||||
|
||||
if (_braille_console_setup(&str, &brl_options))
|
||||
return 1;
|
||||
|
||||
|
||||
@@ -1283,11 +1283,13 @@ SYSCALL_DEFINE1(uname, struct old_utsname __user *, name)
|
||||
|
||||
SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
|
||||
{
|
||||
struct oldold_utsname tmp = {};
|
||||
struct oldold_utsname tmp;
|
||||
|
||||
if (!name)
|
||||
return -EFAULT;
|
||||
|
||||
memset(&tmp, 0, sizeof(tmp));
|
||||
|
||||
down_read(&uts_sem);
|
||||
memcpy(&tmp.sysname, &utsname()->sysname, __OLD_UTS_LEN);
|
||||
memcpy(&tmp.nodename, &utsname()->nodename, __OLD_UTS_LEN);
|
||||
|
||||
@@ -1004,9 +1004,8 @@ static int scale64_check_overflow(u64 mult, u64 div, u64 *base)
|
||||
((int)sizeof(u64)*8 - fls64(mult) < fls64(rem)))
|
||||
return -EOVERFLOW;
|
||||
tmp *= mult;
|
||||
rem *= mult;
|
||||
|
||||
do_div(rem, div);
|
||||
rem = div64_u64(rem * mult, div);
|
||||
*base = tmp + rem;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3043,6 +3043,9 @@ int trace_array_printk(struct trace_array *tr,
|
||||
if (!(global_trace.trace_flags & TRACE_ITER_PRINTK))
|
||||
return 0;
|
||||
|
||||
if (!tr)
|
||||
return -ENOENT;
|
||||
|
||||
va_start(ap, fmt);
|
||||
ret = trace_array_vprintk(tr, ip, fmt, ap);
|
||||
va_end(ap);
|
||||
@@ -8537,7 +8540,7 @@ __init static int tracer_alloc_buffers(void)
|
||||
goto out_free_buffer_mask;
|
||||
|
||||
/* Only allocate trace_printk buffers if a trace_printk exists */
|
||||
if (__stop___trace_bprintk_fmt != __start___trace_bprintk_fmt)
|
||||
if (&__stop___trace_bprintk_fmt != &__start___trace_bprintk_fmt)
|
||||
/* Must be called before global_trace.buffer is allocated */
|
||||
trace_printk_init_buffers();
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@ FTRACE_ENTRY(kernel_stack, stack_entry,
|
||||
|
||||
F_STRUCT(
|
||||
__field( int, size )
|
||||
__dynamic_array(unsigned long, caller )
|
||||
__array( unsigned long, caller, FTRACE_STACK_ENTRIES )
|
||||
),
|
||||
|
||||
F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
||||
|
||||
@@ -800,6 +800,8 @@ static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
|
||||
char *event = NULL, *sub = NULL, *match;
|
||||
int ret;
|
||||
|
||||
if (!tr)
|
||||
return -ENOENT;
|
||||
/*
|
||||
* The buf format can be <subsystem>:<event-name>
|
||||
* *:<event-name> means any event by that name.
|
||||
|
||||
@@ -4225,7 +4225,6 @@ static int parse_var_defs(struct hist_trigger_data *hist_data)
|
||||
|
||||
s = kstrdup(field_str, GFP_KERNEL);
|
||||
if (!s) {
|
||||
kfree(hist_data->attrs->var_defs.name[n_vars]);
|
||||
ret = -ENOMEM;
|
||||
goto free;
|
||||
}
|
||||
|
||||
@@ -59,14 +59,14 @@ EXPORT_SYMBOL(trace_hardirqs_on_caller);
|
||||
|
||||
__visible void trace_hardirqs_off_caller(unsigned long caller_addr)
|
||||
{
|
||||
lockdep_hardirqs_off(CALLER_ADDR0);
|
||||
|
||||
if (!this_cpu_read(tracing_irq_cpu)) {
|
||||
this_cpu_write(tracing_irq_cpu, 1);
|
||||
tracer_hardirqs_off(CALLER_ADDR0, caller_addr);
|
||||
if (!in_nmi())
|
||||
trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);
|
||||
}
|
||||
|
||||
lockdep_hardirqs_off(CALLER_ADDR0);
|
||||
}
|
||||
EXPORT_SYMBOL(trace_hardirqs_off_caller);
|
||||
#endif /* CONFIG_TRACE_IRQFLAGS */
|
||||
|
||||
Reference in New Issue
Block a user