Commit graph

593188 commits

Author SHA1 Message Date
Blagovest Kolenichev
901bf6ddcc Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4
* refs/heads/tmp-4b8fc9f
  UPSTREAM: locking: avoid passing around 'thread_info' in mutex debugging code
  ANDROID: arm64: fix undeclared 'init_thread_info' error
  UPSTREAM: kdb: use task_cpu() instead of task_thread_info()->cpu
  Linux 4.4.82
  net: account for current skb length when deciding about UFO
  ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output
  mm/mempool: avoid KASAN marking mempool poison checks as use-after-free
  KVM: arm/arm64: Handle hva aging while destroying the vm
  sparc64: Prevent perf from running during super critical sections
  udp: consistently apply ufo or fragmentation
  revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"
  revert "net: account for current skb length when deciding about UFO"
  packet: fix tp_reserve race in packet_set_ring
  net: avoid skb_warn_bad_offload false positives on UFO
  tcp: fastopen: tcp_connect() must refresh the route
  net: sched: set xt_tgchk_param par.nft_compat as 0 in ipt_init_target
  bpf, s390: fix jit branch offset related to ldimm64
  net: fix keepalive code vs TCP_FASTOPEN_CONNECT
  tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction states
  ANDROID: keychord: Fix for a memory leak in keychord.
  ANDROID: keychord: Fix races in keychord_write.
  Use %zu to print resid (size_t).
  ANDROID: keychord: Fix a slab out-of-bounds read.
  Linux 4.4.81
  workqueue: implicit ordered attribute should be overridable
  net: account for current skb length when deciding about UFO
  ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output
  mm: don't dereference struct page fields of invalid pages
  signal: protect SIGNAL_UNKILLABLE from unintentional clearing.
  lib/Kconfig.debug: fix frv build failure
  mm, slab: make sure that KMALLOC_MAX_SIZE will fit into MAX_ORDER
  ARM: 8632/1: ftrace: fix syscall name matching
  virtio_blk: fix panic in initialization error path
  drm/virtio: fix framebuffer sparse warning
  scsi: qla2xxx: Get mutex lock before checking optrom_state
  phy state machine: failsafe leave invalid RUNNING state
  x86/boot: Add missing declaration of string functions
  tg3: Fix race condition in tg3_get_stats64().
  net: phy: dp83867: fix irq generation
  sh_eth: R8A7740 supports packet shecksumming
  wext: handle NULL extra data in iwe_stream_add_point better
  sparc64: Measure receiver forward progress to avoid send mondo timeout
  xen-netback: correctly schedule rate-limited queues
  net: phy: Fix PHY unbind crash
  net: phy: Correctly process PHY_HALTED in phy_stop_machine()
  net/mlx5: Fix command bad flow on command entry allocation failure
  sctp: fix the check for _sctp_walk_params and _sctp_walk_errors
  sctp: don't dereference ptr before leaving _sctp_walk_{params, errors}()
  dccp: fix a memleak for dccp_feat_init err process
  dccp: fix a memleak that dccp_ipv4 doesn't put reqsk properly
  dccp: fix a memleak that dccp_ipv6 doesn't put reqsk properly
  net: ethernet: nb8800: Handle all 4 RGMII modes identically
  ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment()
  packet: fix use-after-free in prb_retire_rx_blk_timer_expired()
  openvswitch: fix potential out of bound access in parse_ct
  mcs7780: Fix initialization when CONFIG_VMAP_STACK is enabled
  rtnetlink: allocate more memory for dev_set_mac_address()
  ipv4: initialize fib_trie prior to register_netdev_notifier call.
  ipv6: avoid overflow of offset in ip6_find_1stfragopt
  net: Zero terminate ifr_name in dev_ifname().
  ipv4: ipv6: initialize treq->txhash in cookie_v[46]_check()
  saa7164: fix double fetch PCIe access condition
  drm: rcar-du: fix backport bug
  f2fs: sanity check checkpoint segno and blkoff
  media: lirc: LIRC_GET_REC_RESOLUTION should return microseconds
  mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries
  iser-target: Avoid isert_conn->cm_id dereference in isert_login_recv_done
  iscsi-target: Fix delayed logout processing greater than SECONDS_FOR_LOGOUT_COMP
  iscsi-target: Fix initial login PDU asynchronous socket close OOPs
  iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race
  iscsi-target: Always wait for kthread_should_stop() before kthread exit
  target: Avoid mappedlun symlink creation during lun shutdown
  media: platform: davinci: return -EINVAL for VPFE_CMD_S_CCDC_RAW_PARAMS ioctl
  ARM: dts: armada-38x: Fix irq type for pca955
  ext4: fix overflow caused by missing cast in ext4_resize_fs()
  ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize
  mm/page_alloc: Remove kernel address exposure in free_reserved_area()
  KVM: async_pf: make rcu irq exit if not triggered from idle task
  ASoC: do not close shared backend dailink
  ALSA: hda - Fix speaker output from VAIO VPCL14M1R
  workqueue: restore WQ_UNBOUND/max_active==1 to be ordered
  libata: array underflow in ata_find_dev()
  ANDROID: binder: don't queue async transactions to thread.
  ANDROID: binder: don't enqueue death notifications to thread todo.
  ANDROID: binder: call poll_wait() unconditionally.
  android: configs: move quota-related configs to recommended
  BACKPORT: arm64: split thread_info from task stack
  UPSTREAM: arm64: assembler: introduce ldr_this_cpu
  UPSTREAM: arm64: make cpu number a percpu variable
  UPSTREAM: arm64: smp: prepare for smp_processor_id() rework
  BACKPORT: arm64: move sp_el0 and tpidr_el1 into cpu_suspend_ctx
  UPSTREAM: arm64: prep stack walkers for THREAD_INFO_IN_TASK
  UPSTREAM: arm64: unexport walk_stackframe
  UPSTREAM: arm64: traps: simplify die() and __die()
  UPSTREAM: arm64: factor out current_stack_pointer
  BACKPORT: arm64: asm-offsets: remove unused definitions
  UPSTREAM: arm64: thread_info remove stale items
  UPSTREAM: thread_info: include <current.h> for THREAD_INFO_IN_TASK
  UPSTREAM: thread_info: factor out restart_block
  UPSTREAM: kthread: Pin the stack via try_get_task_stack()/put_task_stack() in to_live_kthread() function
  UPSTREAM: sched/core: Add try_get_task_stack() and put_task_stack()
  UPSTREAM: sched/core: Allow putting thread_info into task_struct
  UPSTREAM: printk: when dumping regs, show the stack, not thread_info
  UPSTREAM: fix up initial thread stack pointer vs thread_info confusion
  UPSTREAM: Clarify naming of thread info/stack allocators
  ANDROID: sdcardfs: override credential for ioctl to lower fs

Conflicts:
	android/configs/android-base.cfg
	arch/arm64/Kconfig
	arch/arm64/include/asm/suspend.h
	arch/arm64/kernel/head.S
	arch/arm64/kernel/smp.c
	arch/arm64/kernel/suspend.c
	arch/arm64/kernel/traps.c
	arch/arm64/mm/proc.S
	kernel/fork.c
	sound/soc/soc-pcm.c

Change-Id: I273e216c94899a838bbd208391c6cbe20b2bf683
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-09-01 11:47:49 -07:00
Linux Build Service Account
e243bb8502 Merge "drm/msm: fix hdcp 1x module for repeater test cases" 2017-08-22 18:56:14 -07:00
Linux Build Service Account
1633cf74a4 Merge "cnss2: Add debugfs entries for register read/write" 2017-08-22 18:56:13 -07:00
Linux Build Service Account
853dc76799 Merge "tracing: fix race condition reading saved tgids" 2017-08-22 18:56:12 -07:00
Linux Build Service Account
f74e83da80 Merge "msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG" 2017-08-22 18:56:11 -07:00
Haibin Liu
22c9c625bd msm: sensor: Fix crash when ioctl VIDIOC_MSM_SENSOR_INIT_CFG
the invalid data of sensor_init_cfg_data, is used by
msm_sensor_driver_probe. This cause crash when ioctl
VIDIOC_MSM_SENSOR_INIT_CFG repeatedly and aggressively.

Change-Id: Idffcd3b82b9590dbfdcaf14b80668cc894178f54
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2017-08-22 06:46:50 -07:00
Linux Build Service Account
232b0f15cc Merge "ASoC: core: Fix possible NULL pointer dereference" 2017-08-22 04:11:35 -07:00
Linux Build Service Account
af6102c60e Merge "msm: sensor: Add mutex lock during ois power down operations" 2017-08-22 04:11:35 -07:00
Linux Build Service Account
a39227b922 Merge "tracing: Revert commits improving handling of saved_tgids" 2017-08-22 04:11:33 -07:00
Linux Build Service Account
9e200511bc Merge "ARM: dts: msm: Enable laser sensor on sdm630 MTP" 2017-08-22 04:11:32 -07:00
Linux Build Service Account
c0ee484da1 Merge "ion: Convert allocation counters to long" 2017-08-22 04:11:31 -07:00
Linux Build Service Account
0d782ac54b Merge "dwc3: Add required support to get lfps_rxterm interrupt from SS_PHY" 2017-08-22 04:11:24 -07:00
Meng Wang
214496cb3d ASoC: core: Fix possible NULL pointer dereference
When SSR is triggered when the system does not have a sound card
registered, but has codecs. The pointer card sent from codec driver
to snd_soc_card_change_online_state is NULL. Add null check for soc_card
before dereferencing.

Change-Id: I23342a6cbd9d53e62b2ea11dfe79aad3759df6f0
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2017-08-21 23:05:03 -07:00
Linux Build Service Account
47b13c41e7 Merge "usb: pd: simplify pd_phy_write() and pd_phy_signal() usage" 2017-08-21 20:01:19 -07:00
Linux Build Service Account
5f76ac9d86 Merge "msm: ADSPRPC: validate user buffers after copying from user" 2017-08-21 20:01:11 -07:00
Linux Build Service Account
fc59d81f3e Merge "leds: leds-qpnp: Set PWM channel operational mode explicitly" 2017-08-21 20:01:10 -07:00
Linux Build Service Account
a11dada42d Merge "usb: pd: force disconnect upon unexpected SRC->SNK transition" 2017-08-21 20:01:08 -07:00
Adrian Salido
761ef1a0a0 tracing: fix race condition reading saved tgids
Commit 939c7a4f04 ("tracing: Introduce saved_cmdlines_size file")
introduced ability to change saved cmdlines size. This resized saved
command lines but missed resizing tgid mapping as well.

Another issue is that when the resize happens, it removes saved command
lines and reallocates new memory for it. This introduced a race
condition when reading the global savecmd as this can be freed in the
middle of accessing it causing a use after free access. Fix this by
implementing locking.

Signed-off-by: Adrian Salido <salidoa@google.com>
Bug: 36007735
Change-Id: I334791ac35f8bcbd34362ed112aa624275a46947
Git-repo: https://android.googlesource.com/kernel/common
Git-commit: 7116d306da66de0de21e982024b4d3a3056f4461
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-08-21 16:02:39 -07:00
Dennis Cagle
3fe1011f7e tracing: Revert commits improving handling of saved_tgids
This reverts commit 7005c6eec7 ("tracing: Free saved_tgids memory
in free_saved_cmdlines_buffer") and commit be0b454d52 ("tracing:
Modify saved_tgids size for change in saved_cmdline_size")

An upstream patch is now available that does the same thing and
handles additional cases as well.

Change-Id: I05cf2dc566a6425e58076ae2e9698335b6d738cc
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2017-08-21 16:00:52 -07:00
Linux Build Service Account
cb1c821645 Merge "ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite" 2017-08-21 12:16:36 -07:00
Linux Build Service Account
afd2fd3441 Merge "ASoC: msm: qdsp6v2: Do not reset backend pass-through mode" 2017-08-21 12:16:35 -07:00
Linux Build Service Account
da4c2cf3b3 Merge "qcom: smb138x: supsend USBIN and disable OTG before shutdown" 2017-08-21 12:16:28 -07:00
Linux Build Service Account
22b849b8f3 Merge "clk: osm: Check for valid acd offset for input from debugfs" 2017-08-21 12:16:27 -07:00
Rahul Sharma
d16420b459 msm: sensor: Add mutex lock during ois power down operations
Protecting operations performed during ois powerdown
from race condition by adding mutex locks.

CRs-Fixed: 2081806
Change-Id: I8a918dc306e639d50a896c8d77f8eb7a72fcb195
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-08-21 07:06:15 -07:00
Yujun Zhang
71348bdb76 ARM: dts: msm: Remove configuration of the 2nd ADV7533 chip on ADP Lite
On APQ8096 ADP Lite board, the secondary ADV7533 bridge chip is
removed and its instance is already disabled in current DTS hence
related sde_kms should also remove it. Otherwise, component master
could not find the component for the display instance and causes
drm driver probe failure.

Change-Id: I0fd694cf33eaf8b29ca86efd2ea105ac565bdba1
CRs-Fixed: 2091671
Signed-off-by: Yujun Zhang <yujunzhang@codeaurora.org>
2017-08-21 18:16:09 +08:00
Linux Build Service Account
468ba7b8f9 Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4" 2017-08-21 00:20:14 -07:00
Linux Build Service Account
5883338fd9 Merge "wcnss: modularize wcnss power up sequence and debug logs" 2017-08-21 00:20:13 -07:00
Linux Build Service Account
d3b34dae57 Merge "wcnss: update MAC address generate logic from the serial number" 2017-08-21 00:20:12 -07:00
Linux Build Service Account
e235763c9f Merge "icnss: Add support to validate the result and error code" 2017-08-21 00:20:11 -07:00
Linux Build Service Account
50203f7fec Merge "msm: ipa3: Fix to avoid accessing of uninitialized structure" 2017-08-21 00:20:10 -07:00
Linux Build Service Account
2a003c6ab4 Merge "soc: qcom: glink_smem_native_xprt: Fix memory leak during qos init" 2017-08-21 00:20:09 -07:00
Linux Build Service Account
b9b46f3610 Merge "drm/msm: Disable clocks when GPU is inactive" 2017-08-21 00:20:08 -07:00
Linux Build Service Account
1067bf088e Merge "ASoC: wcd-dsp-mgr: fix race during subsystem restart" 2017-08-21 00:20:00 -07:00
Linux Build Service Account
6afe3a8c3b Merge "ASoc: wcd934x-dsp-cntl: notify online event after clocks are disabled" 2017-08-21 00:19:59 -07:00
Linux Build Service Account
ba41092462 Merge "ARM: dts: msm: Add Primary TDM Node for msm8996 Hypervisor" 2017-08-21 00:19:57 -07:00
Linux Build Service Account
b897137030 Merge "msm: sensor: Add mutex lock during ois power down operations" 2017-08-21 00:19:56 -07:00
Linux Build Service Account
025604fd4e Merge "ARM: dts: msm: Update boot option for PCIe on APQ8098" 2017-08-21 00:19:56 -07:00
Linux Build Service Account
dd5490df50 Merge "msm: vidc: Fix possible out of bound array access" 2017-08-21 00:19:55 -07:00
Linux Build Service Account
95b505dfc6 Merge "power: pmic-voter: make debug status more parsable" 2017-08-21 00:19:53 -07:00
Linux Build Service Account
3d4a252808 Merge "msm: adsprpc: Avoid leak info of pointers addresses to dmesg" 2017-08-21 00:19:52 -07:00
Linux Build Service Account
19987eecbf Merge "msm: sde: remove boot warning of drm AD properties" 2017-08-21 00:19:51 -07:00
Linux Build Service Account
3403db6eab Merge "msm: mdss: do not set sink max TMDS clock for DVI device" 2017-08-21 00:19:50 -07:00
Linux Build Service Account
300a5df270 Merge "msm: sde: fix page freeing error when handing off early display" 2017-08-21 00:19:49 -07:00
Linux Build Service Account
2d27540111 Merge "soc: qcom: Modify scm_qcpe to comply with new hab API" 2017-08-21 00:19:48 -07:00
Linux Build Service Account
42be98d03f Merge "ARM: dts: msm: Enable early camera on msm8996 auto" 2017-08-21 00:19:47 -07:00
Linux Build Service Account
40bd639075 Merge "ARM: dts: msm: add support for QBT1000 on SDM660" 2017-08-21 00:19:45 -07:00
Linux Build Service Account
5cd00ff15b Merge "qbt1000: Add changes to support VOLUMEDOWN and CBGE" 2017-08-21 00:19:44 -07:00
Linux Build Service Account
f01c603a50 Merge "power: smb2: Update the charger buck frequencies for PM660" 2017-08-21 00:19:43 -07:00
Linux Build Service Account
fe66215fd0 Merge "power: qpnp-smb2: expose CHARGE_COUNTER prop via batt psy" 2017-08-21 00:19:42 -07:00
Linux Build Service Account
b8646eb8a5 Merge "usb: dwc3: msm: clear resource on dwc3_msm_probe defer" 2017-08-21 00:19:41 -07:00