Commit Graph

4326 Commits

Author SHA1 Message Date
qctecmdr Service
8db48b0930 Merge "qseecom: expose a new IOCTL for new FDE design" 2018-08-14 08:04:25 -07:00
qctecmdr Service
41b6bdedae Merge "defconfig: msm: enable dvb demux modules compilation" 2018-08-14 04:33:41 -07:00
Dinesh K Garg
deca1043dc qseecom: expose a new IOCTL for new FDE design
Adding a new IOCTL QSEECOM_IOCTL_SET_ICE_INFO so that userspace can
provide information to kernel whenever FDE is enabled.

Change-Id: I03b5571effc07fe5b6b261fae98a0bd2d2958744
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2018-08-13 23:18:06 -07:00
qctecmdr Service
dd992fb4c3 Merge "Revert "msm: vidc: Remove QCOM keyword from buffer flag"" 2018-08-13 17:19:08 -07:00
Monika Singh
76ba917341 Migrate mpq demux driver from kernel 4.9 to 4.14
This change migrates all the relevant files and updates made
to the dvb/demux framework, required for mpq demux driver.

The snapshot is taken as of msm-4.9,
'commit ba29a3e82c501 ("Migrate mpq demux driver from kernel 4.4 to 4.9")'
In addition, introduce a few code changes to fix warnings,
typos and other style issues.

Change-Id: I1621409bfbdbbec676a6ba29c0583c80574a4945
Signed-off-by: Monika Singh <monising@codeaurora.org>
2018-08-13 00:42:51 -07:00
qctecmdr Service
b23e46aae5 Merge "msm: ipa: Add WLAN FW SSR event" 2018-08-09 01:36:44 -07:00
Mohammed Javid
544c788e67 msm: ipa: Add WLAN FW SSR event
Add WLAN FW SSR event to handle FW rejuvenate
scenario.

Change-Id: I417d46cc07f455792906a18f4b6dc8e5ca8ca3de
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-08-08 23:56:22 -07:00
qctecmdr Service
7e27904068 Merge "msm: npu: refactor npu_map_buf/npu_unmap_buf functions" 2018-08-08 22:06:04 -07:00
Jilai Wang
bd2d455704 msm: npu: Add asynchronous ioctl support
In order to improve the NPU performance, ioctl commands like
execute_network need to be executed in asynchronous mode to
allow user applications to run multiple operations parallelly.

Change-Id: I8cf4f20569539667a0eda6a0b8e3ec610ddde210
Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>
2018-08-08 20:26:38 -04:00
shubham
e0dd9783c2 Revert "msm: vidc: Remove QCOM keyword from buffer flag"
This reverts commit b1b6c65dac.

The commit b1b6c65dac had non-complaint
keywords, hence reverting the same.

Change-Id: Ibcaaa4b5e696fd518a171d70dedc361e5672c756
Signed-off-by: Shubham Gupta <shubgupt@codeaurora.org>
2018-08-08 18:27:30 +05:30
Mohammed Javid
f0a0e472e2 msm: net: Add support to packet threshold events.
Add support to send conntrack event when
configured packet threshold is met.

Change-Id: I11fe78a74512d901d260deead3354461fc4990ab
Acked-by: Chaitanya Pratapa <cpratapa@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-08-01 06:14:58 -07:00
qctecmdr Service
c8845f0143 Merge "msm: vidc: Remove QCOM keyword from buffer flag" 2018-07-31 22:16:44 -07:00
qctecmdr Service
b45a6444f8 Merge "msm: vidc: Add HEIF encode support" 2018-07-31 18:28:20 -07:00
SaiVamshi Dobbali
b1b6c65dac msm: vidc: Remove QCOM keyword from buffer flag
Inorder to get LOST compliance removing QCOM keyword

Change-Id: I67f920199a0f2a6ca15e1ec8dc33819421527cc4
Signed-off-by: SaiVamshi Dobbali <sdobbali@codeaurora.org>
2018-07-31 16:03:09 +05:30
Amit Shekhar
5bcf89d81c msm: vidc: Add HEIF encode support
Add support for HEIF HW encoding which uses HEVC encoder
and performs tile based frame encoding.
Supports configuration of Grid-enable, Quality-factor,
Constant-quality rate control and MainStill profile.

Change-Id: I3062b97f6a713a64119427135f4699d8900810c3
Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
2018-07-26 18:06:14 -07:00
qctecmdr Service
2a72c9c0a9 Merge "msm: vidc: Add enc pixel fmt constraint entry for NV12_512" 2018-07-25 18:20:00 -07:00
Amit Shekhar
380828c98d msm: vidc: Add NV12_512 support for encoder
Add NV12_512 linear color format, aligned to 512, for encoder.

Change-Id: If9a9494e5a93ba1eec2140008644853e4af87c56
Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
2018-07-24 18:13:46 -07:00
Anirudh Ghayal
4903dc3ce6 power: qpnp-qg: Add handling for SYS_SOC
Use the raw SYS_SOC to calculate the MSOC. Adjust
the SOC at cutoff and termination for better user
experience.

Change-Id: I1d1a0eb19cb89df754a9694c1484de37db2eb218
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2018-07-23 20:26:32 -07:00
qctecmdr Service
224acb50da Merge "msm: vidc: Use data corrupt flag instead of error flag" 2018-07-20 15:46:57 -07:00
qctecmdr Service
31bafe7400 Merge "msm: vidc: extend AVC level query support upto 6.2" 2018-07-18 19:34:43 -07:00
qctecmdr Service
8fee927193 Merge "ARM: dts: msm: Specify L3 GPU voter power levels on sm8150" 2018-07-18 11:26:00 -07:00
Vaibhav Deshu Venkatesh
e1e9464259 msm: vidc: Use data corrupt flag instead of error flag
Error flag is not being propogated to user space by v4l2
framework. Hence, use data custom flag(data corrupt flag)
instead.

CRs-Fixed: 2278442
Change-Id: I570ca122b62bba69ef82ed2bb3665d4660f5989e
Signed-off-by: Vaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
2018-07-17 18:13:15 -07:00
Urvashi Agrawal
c087b71fa9 msm: kgsl: Add L3 performance hint
Add software path to bump the l3 frequency using a
performance hint from user space in I/O coherence cases.

Change-Id: I559fecf0dbbf79ebe3972db2a65bde6b69063fc9
Signed-off-by: Urvashi Agrawal <urvaagra@codeaurora.org>
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2018-07-17 11:19:14 +05:30
Ghanim Fodi
1e7108411c msm: ipa4: Add IPA endpoints mapping for IPA 4.5
Add IPA endpoints mapping for regular case and MHI
case. For each EP, configure resource group
filtering capability, sequence, QMB, EE, GSI channel,
TLV/AOS and GSI smart prefetch info.

CRs-Fixed: 2275215
Change-Id: I0905d5937ca3d15fabb2d144ce62592145db7caa
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2018-07-15 01:32:27 -07:00
Shi zhongbo
163c180d1d msm: vidc: extend AVC level support upto 6.2
Adding AVC level 6.1 and 6.2 enums in uapi header file.

Change-Id: I7ebbe2f5bc31d0fbfa1100e1e867c2575bfcbaa2
Signed-off-by: Zhongbo Shi <zhongbos@codeaurora.org>
2018-07-13 11:35:23 +08:00
qctecmdr Service
d9a9a93fa0 Merge "msm: npu: Firmware APIs update and add new ioctl commands" 2018-07-11 13:11:29 -07:00
qctecmdr Service
dadf9e3df4 Merge "qbt1000: Add support for fingerprint gestures" 2018-07-11 13:11:27 -07:00
Jilai Wang
ea0adb14c1 msm: npu: Firmware APIs update and add new ioctl commands
NPU firmware APIs are changed to support concurrent networks and
ipc between NPU and CDSP. Two new ioctl commands (load_network_v2
and execute_network_v2) are added to support new FW APIs.

Change-Id: I5c1ca09dc8a00c5d32fbb21c830cf3f4b9b9aa1d
Signed-off-by: Jilai Wang <jilaiw@codeaurora.org>
2018-07-10 17:29:36 -04:00
Hemant Kumar
f91e8e390f usb: gadget: f_gsi: Add QTI_CTRL_DATA_BUF_INFO ioctl
QTI needs to provide IN and OUT gsi endpoint request buffer length
and total size of the buffer length used by the driver to remote
subsystem. Hence add new ioctl to pass this information.

Change-Id: I4663a8f5f50c0888db142787e17852ebf6e64606
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2018-07-10 12:06:36 -07:00
qctecmdr Service
a14b31bcb4 Merge "ARM: dts: msm: Add smcinvoke node for SM8150" 2018-07-04 05:24:16 -07:00
Dinesh K Garg
fd55b8055a msm: mink: Add support for local objects
Currently, SMCInvoke does not support requests initiated
by TZ to get data from Linux OS. Adding support so that TZ
can call Linux OS. This includes support of memory objects
which are owned by Linux OS.

Change-Id: Ib97fe13954865a1ae908aa4da2e0439dbc26b38a
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2018-07-02 15:18:13 -07:00
Anirudh Ghayal
685351ad26 power: qpnp-qg: Update the QPNP QG driver from 4.9 kernel
This implementation is based on snapshot of msm-4.9
commit 42e1de365776 ("ARM: dts: msm: Enable the
dpdm-supply node for MSM8917/37").

Change-Id: I61c6a21f8e5a47b02387a1dfbeeed4bb821da139
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2018-06-29 06:30:56 -07:00
Abir Ghosh
0d48e5ab4d qbt1000: Add support for fingerprint gestures
Add changes to support fingerprint gesture detection

Change-Id: I66a33603ddfb7e605919fa7e09899c474d3ec992
Acked-by: Tal Tzeisler <talt@qti.qualcomm.com>
Acked-by: David Arinzon <darinzon@qti.qualcomm.com>
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2018-06-28 23:27:17 -07:00
qctecmdr Service
5899622a64 Merge "NFC: Add driver support for NTAG" 2018-06-28 17:29:13 -07:00
Dmitry Lebed
0751b64e9e cfg80211/nl80211: add CAC_STARTED event
CAC_STARTED event is needed for DFS offload feature and
should be generated by driver/HW if DFS_OFFLOAD is enabled.

Signed-off-by: Dmitry Lebed <dlebed@quantenna.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Change-Id: Ib670d13989650a4b4865d40f3b4f37fb94ebd161
Git-commit: 2cb021f5de55b1d158fa18b0215a4613c3289a82
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-fixed: 2265562
Signed-off-by: Peng Xu <pxu@codeaurora.org>
2018-06-27 16:17:13 -07:00
qctecmdr Service
6311fc4842 Merge "msm: ipa3: fix hdr offset issue" 2018-06-27 07:39:15 -07:00
Sumatheendra Raghavendrachar
e9c434c264 NFC: Add driver support for NTAG
Driver implementation to interact with NTAG chipsets,
NTAG is NFC tags that combine passive NFC interface with contact
i2c interface.

Change-Id: I4f871285ece6c864f57274c86059096953e5535e
Signed-off-by: Sumatheendra Raghavendrachar <sumath@codeaurora.org>
2018-06-27 11:32:06 +05:30
Sunil Dutt
733cb264f1 cfg80211: Scan results to also report the per chain signal strength
This commit enhances the scan results to report the per chain signal
strength based on the latest BSS update. This provides similar
information to what is already available through STA information.

Signed-off-by: Sunil Dutt <usdutt@qti.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Git-commit: 983dafaab799511e092ffd006f3a064b37ccbccf
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-fixed: 2173940
Change-Id: I4300c1a6a3af4dc1244ee4717a772bfaa927b2db
Signed-off-by: Srinivas Dasari <dasaris@codeaurora.org>
2018-06-26 14:09:31 -07:00
Skylar Chang
269ece2489 msm: ipa: support ipacm cleanup
Support header/filter, routing rules
cleanup when user-space module
crashed like ipacm and also cached
the wlan client connect messages
for ipacm to query.

Change-Id: Ib09cbe0e9114aa5a5673898ff796de7e7944af35
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-06-25 10:37:30 -07:00
Srinivas Dasari
d3463b6a3c cfg80211/nl80211: Optional authentication offload to userspace
This interface allows the host driver to offload the authentication to
user space. This is exclusively defined for host drivers that do not
define separate commands for authentication and association, but rely on
userspace SME (e.g., in wpa_supplicant for the ~WPA_DRIVER_FLAGS_SME
case) for the authentication to happen. This can be used to implement
SAE without full implementation in the kernel/firmware while still being
able to use NL80211_CMD_CONNECT with driver-based BSS selection.

Host driver sends NL80211_CMD_EXTERNAL_AUTH event to start/abort
authentication to the port on which connect is triggered and status
of authentication is further indicated by user space to host
driver through the same command response interface.

User space entities advertise this capability through the
NL80211_ATTR_EXTERNAL_AUTH_SUPP flag in the NL80211_CMD_CONNECT request.
Host drivers shall look at this capability to offload the authentication.

Signed-off-by: Srinivas Dasari <dasaris@qti.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
[add socket connection ownership check]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Git-commit: 40cbfa90218bc570a7959b436b9d48a18c361041
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
CRs-Fixed: 2262200
Change-Id: Id925dd82d9a9c719b32aac2de75b6ad001f1a958
[dasaris@codeaurora.org: merging with msm-specific changes]
Signed-off-by: Srinivas Dasari <dasaris@codeaurora.org>
2018-06-18 11:11:49 +05:30
Blagovest Kolenichev
a5920a6efd Merge android-4.14.49 into msm-4.14
* refs/heads/tmp-37f5b3d
  Linux 4.14.49
  drm: set FMODE_UNSIGNED_OFFSET for drm files
  PCI: hv: Do not wait forever on a device that has disappeared
  cls_flower: Fix incorrect idr release when failing to modify rule
  rtnetlink: validate attributes in do_setlink()
  virtio-net: fix leaking page for gso packet during mergeable XDP
  net/mlx5e: When RXFCS is set, add FCS data into checksum calculation
  virtio-net: correctly check num_buf during err path
  tun: Fix NULL pointer dereference in XDP redirect
  net/mlx4: Fix irq-unsafe spinlock usage
  virtio-net: correctly transmit XDP buff after linearizing
  net-sysfs: Fix memory leak in XPS configuration
  net: phy: broadcom: Fix auxiliary control register reads
  ipv6: sr: fix memory OOB access in seg6_do_srh_encap/inline
  vrf: check the original netdevice for generating redirect
  vhost: synchronize IOTLB message with dev cleanup
  team: use netdev_features_t instead of u32
  sctp: not allow transport timeout value less than HZ/5 for hb_timer
  qed: Fix mask for physical address in ILT entry
  packet: fix reserve calculation
  net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
  net: phy: broadcom: Fix bcm_write_exp()
  net/packet: refine check for priv area size
  net: metrics: add proper netlink validation
  net: ipv4: add missing RTA_TABLE to rtm_ipv4_policy
  netdev-FAQ: clarify DaveM's position for stable backports
  kcm: Fix use-after-free caused by clonned sockets
  isdn: eicon: fix a missing-check bug
  ipv6: omit traffic class when calculating flow hash
  ipv4: remove warning in ip_recv_error
  ipmr: properly check rhltable_init() return value
  ip6_tunnel: remove magic mtu value 0xFFF8
  ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
  enic: set DMA mask to 47 bit
  dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
  bnx2x: use the right constant
  be2net: Fix error detection logic for BE3
  kconfig: Avoid format overflow warning from GCC 8.1
  btrfs: define SUPER_FLAG_METADUMP_V2
  mmap: relax file size limit for regular files
  mmap: introduce sane default mmap limits
  scsi: sd_zbc: Avoid that resetting a zone fails sporadically
  scsi: sd_zbc: Fix potential memory leak
  FROMLIST: f2fs: run fstrim asynchronously if runtime discard is on

Change-Id: I3b2bc1938bd99c73417b340af4ac523103e15775
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2018-06-14 08:14:48 -07:00
Greg Kroah-Hartman
37f5b3d9c7 Merge 4.14.49 into android-4.14
Changes in 4.14.49
	scsi: sd_zbc: Fix potential memory leak
	scsi: sd_zbc: Avoid that resetting a zone fails sporadically
	mmap: introduce sane default mmap limits
	mmap: relax file size limit for regular files
	btrfs: define SUPER_FLAG_METADUMP_V2
	kconfig: Avoid format overflow warning from GCC 8.1
	be2net: Fix error detection logic for BE3
	bnx2x: use the right constant
	dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
	enic: set DMA mask to 47 bit
	ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
	ip6_tunnel: remove magic mtu value 0xFFF8
	ipmr: properly check rhltable_init() return value
	ipv4: remove warning in ip_recv_error
	ipv6: omit traffic class when calculating flow hash
	isdn: eicon: fix a missing-check bug
	kcm: Fix use-after-free caused by clonned sockets
	netdev-FAQ: clarify DaveM's position for stable backports
	net: ipv4: add missing RTA_TABLE to rtm_ipv4_policy
	net: metrics: add proper netlink validation
	net/packet: refine check for priv area size
	net: phy: broadcom: Fix bcm_write_exp()
	net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
	packet: fix reserve calculation
	qed: Fix mask for physical address in ILT entry
	sctp: not allow transport timeout value less than HZ/5 for hb_timer
	team: use netdev_features_t instead of u32
	vhost: synchronize IOTLB message with dev cleanup
	vrf: check the original netdevice for generating redirect
	ipv6: sr: fix memory OOB access in seg6_do_srh_encap/inline
	net: phy: broadcom: Fix auxiliary control register reads
	net-sysfs: Fix memory leak in XPS configuration
	virtio-net: correctly transmit XDP buff after linearizing
	net/mlx4: Fix irq-unsafe spinlock usage
	tun: Fix NULL pointer dereference in XDP redirect
	virtio-net: correctly check num_buf during err path
	net/mlx5e: When RXFCS is set, add FCS data into checksum calculation
	virtio-net: fix leaking page for gso packet during mergeable XDP
	rtnetlink: validate attributes in do_setlink()
	cls_flower: Fix incorrect idr release when failing to modify rule
	PCI: hv: Do not wait forever on a device that has disappeared
	drm: set FMODE_UNSIGNED_OFFSET for drm files
	Linux 4.14.49

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2018-06-12 18:33:52 +02:00
Anand Jain
058dd233b5 btrfs: define SUPER_FLAG_METADUMP_V2
commit e2731e55884f2138a252b0a3d7b24d57e49c3c59 upstream.

btrfs-progs uses super flag bit BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34).
So just define that in kernel so that we know its been used.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-06-11 22:49:18 +02:00
Amir Levy
6594bb37d2 msm: ipa4: add IOCTL for bridge to vlan mapping
IPACM needs info about bridge association with VLANs.
Add an IOCTL to send this info to IPACM.

Change-Id: Ifeaec348339cd9dd7cf6b507346b61f570861bfc
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2018-06-10 01:54:16 -07:00
Ghanim Fodi
0eddbacb8b msm: ipa3: add initial support for ipa 4.5 and gsi 2.5
Add entries to the relevant switch cases
and tables for the new IPA4.5 and GSI2.5

CRs-fixed: 2255324
Change-Id: I9401826a4ac99179f357a2b54148382f002564cc
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2018-06-07 00:14:45 -07:00
qctecmdr Service
d1514cd853 Merge "Merge remote-tracking branch 'remotes/origin/tmp-eca84e5' into msm-4.14" 2018-06-06 12:26:36 -07:00
qctecmdr Service
ecb302a2ab Merge "nl80211: Introduce scan flags to emphasize requested scan behavior" 2018-06-05 14:57:56 -07:00
Isaac J. Manjarres
10289c4840 Merge remote-tracking branch 'remotes/origin/tmp-eca84e5' into msm-4.14
* remotes/origin/tmp-eca84e5:
  Linux 4.14.48
  powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx
  powerpc/mm/slice: Enhance for supporting PPC32
  powerpc/mm/slice: create header files dedicated to slices
  powerpc/mm/slice: Remove intermediate bitmap copy
  drm/i915: Disable LVDS on Radiant P845
  drm/i915/lvds: Move acpi lid notification registration to registration phase
  drm/psr: Fix missed entry in PSR setup time table.
  intel_th: Use correct device when freeing buffers
  Revert "rt2800: use TXOP_BACKOFF for probe frames"
  mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty()
  IB/core: Fix error code for invalid GID entry
  hwtracing: stm: fix build error on some arches
  stm class: Use vmalloc for the master map
  scsi: scsi_transport_srp: Fix shost to rport translation
  MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests
  MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs
  MIPS: lantiq: gphy: Drop reboot/remove reset asserts
  iio: adc: select buffer for at91-sama5d2_adc
  iio:kfifo_buf: check for uint overflow
  iio:buffer: make length types match kfifo types
  iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ
  tcp: avoid integer overflows in tcp_rcv_space_adjust()
  kbuild: clang: disable unused variable warnings only when constant
  platform/chrome: cros_ec_lpc: remove redundant pointer request
  ASoC: Intel: sst: remove redundant variable dma_dev_name
  rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c
  drm/amd/powerplay: Fix enum mismatch
  dma-buf: remove redundant initialization of sg_table
  drm/i915: Always sanity check engine state upon idling
  kbuild: clang: remove crufty HOSTCFLAGS
  cfg80211: further limit wiphy names to 64 bytes
  selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
  tracing: Make the snapshot trigger work with instances
  tracing: Fix crash when freeing instances with event triggers
  Input: elan_i2c_smbus - fix corrupted stack
  Input: synaptics - add Lenovo 80 series ids to SMBus
  Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
  Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI
  Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI
  xfs: detect agfl count corruption and reset agfl
  xfs: convert XFS_AGFL_SIZE to a helper function
  PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()
  Revert "pinctrl: msm: Use dynamic GPIO numbering"
  x86/MCE/AMD: Cache SMCA MISC block addresses
  x86/mce/AMD: Carve out SMCA get_block_address() code
  objtool: Fix "noreturn" detection for recursive sibling calls
  objtool: Detect RIP-relative switch table references, part 2
  objtool: Detect RIP-relative switch table references
  objtool: Support GCC 8 switch tables
  objtool: Support GCC 8's cold subfunctions
  mm: fix the NULL mapping case in __isolate_lru_page()
  fix io_destroy()/aio_complete() race
  ANDROID: add extra free kbytes tunable
  Revert "ANDROID: net: xfrm: check dir value of xfrm_userpolicy_id"
  ANDROID: x86_64_cuttlefish_defconfig: Enable F2FS
  ANDROID: Update x86_64_cuttlefish_defconfig
  Revert "pinctrl: msm: Use dynamic GPIO numbering"
  FROMLIST: f2fs: early updates queued for v4.18-rc1

Conflicts:
	Makefile

Change-Id: Icf26ca353db37067d2502b3cb84884de5f3a1d1a
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2018-06-05 09:33:38 -07:00
Greg Kroah-Hartman
eca84e5091 Merge 4.14.48 into android-4.14
Changes in 4.14.48
	fix io_destroy()/aio_complete() race
	mm: fix the NULL mapping case in __isolate_lru_page()
	objtool: Support GCC 8's cold subfunctions
	objtool: Support GCC 8 switch tables
	objtool: Detect RIP-relative switch table references
	objtool: Detect RIP-relative switch table references, part 2
	objtool: Fix "noreturn" detection for recursive sibling calls
	x86/mce/AMD: Carve out SMCA get_block_address() code
	x86/MCE/AMD: Cache SMCA MISC block addresses
	Revert "pinctrl: msm: Use dynamic GPIO numbering"
	PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()
	xfs: convert XFS_AGFL_SIZE to a helper function
	xfs: detect agfl count corruption and reset agfl
	Input: synaptics - Lenovo Carbon X1 Gen5 (2017) devices should use RMI
	Input: synaptics - Lenovo Thinkpad X1 Carbon G5 (2017) with Elantech trackpoints should use RMI
	Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
	Input: synaptics - add Lenovo 80 series ids to SMBus
	Input: elan_i2c_smbus - fix corrupted stack
	tracing: Fix crash when freeing instances with event triggers
	tracing: Make the snapshot trigger work with instances
	selinux: KASAN: slab-out-of-bounds in xattr_getsecurity
	cfg80211: further limit wiphy names to 64 bytes
	kbuild: clang: remove crufty HOSTCFLAGS
	drm/i915: Always sanity check engine state upon idling
	dma-buf: remove redundant initialization of sg_table
	drm/amd/powerplay: Fix enum mismatch
	rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c
	ASoC: Intel: sst: remove redundant variable dma_dev_name
	platform/chrome: cros_ec_lpc: remove redundant pointer request
	kbuild: clang: disable unused variable warnings only when constant
	tcp: avoid integer overflows in tcp_rcv_space_adjust()
	iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ
	iio:buffer: make length types match kfifo types
	iio:kfifo_buf: check for uint overflow
	iio: adc: select buffer for at91-sama5d2_adc
	MIPS: lantiq: gphy: Drop reboot/remove reset asserts
	MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs
	MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests
	scsi: scsi_transport_srp: Fix shost to rport translation
	stm class: Use vmalloc for the master map
	hwtracing: stm: fix build error on some arches
	IB/core: Fix error code for invalid GID entry
	mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty()
	Revert "rt2800: use TXOP_BACKOFF for probe frames"
	intel_th: Use correct device when freeing buffers
	drm/psr: Fix missed entry in PSR setup time table.
	drm/i915/lvds: Move acpi lid notification registration to registration phase
	drm/i915: Disable LVDS on Radiant P845
	powerpc/mm/slice: Remove intermediate bitmap copy
	powerpc/mm/slice: create header files dedicated to slices
	powerpc/mm/slice: Enhance for supporting PPC32
	powerpc/mm/slice: Fix hugepage allocation at hint address on 8xx
	Linux 4.14.48

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2018-06-05 11:52:33 +02:00
Eric Biggers
bc342bc029 cfg80211: further limit wiphy names to 64 bytes
commit 814596495dd2b9d4aab92d8f89cf19060d25d2ea upstream.

wiphy names were recently limited to 128 bytes by commit a7cfebcb7594
("cfg80211: limit wiphy names to 128 bytes").  As it turns out though,
this isn't sufficient because dev_vprintk_emit() needs the syslog header
string "SUBSYSTEM=ieee80211\0DEVICE=+ieee80211:$devname" to fit into 128
bytes.  This triggered the "device/subsystem name too long" WARN when
the device name was >= 90 bytes.  As before, this was reproduced by
syzbot by sending an HWSIM_CMD_NEW_RADIO command to the MAC80211_HWSIM
generic netlink family.

Fix it by further limiting wiphy names to 64 bytes.

Reported-by: syzbot+e64565577af34b3768dc@syzkaller.appspotmail.com
Fixes: a7cfebcb7594 ("cfg80211: limit wiphy names to 128 bytes")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-06-05 11:41:56 +02:00