Commit graph

572937 commits

Author SHA1 Message Date
John Stultz
cf25e3a538 xt_qtaguid: Fix panic caused by processing non-full socket.
In an issue very similar to 4e461c777e (xt_qtaguid: Fix panic
caused by synack processing), we were seeing panics on occasion
in testing.

In this case, it was the same issue, but caused by a different
call path, as the sk being returned from qtaguid_find_sk() was
not a full socket. Resulting in the sk->sk_socket deref to fail.

This patch adds an extra check to ensure the sk being retuned
is a full socket, and if not it returns NULL.

Change-Id: Icee0df589ea8d61a999e8c7ea3afdcf4a40b412b
CRs-Fixed: 1035969
Reported-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-commit: cc0063b8eb
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:49:12 -07:00
John Stultz
52d2c42bc4 xt_qtaguid: Fix panic caused by synack processing
In upstream commit ca6fb06518
(tcp: attach SYNACK messages to request sockets instead of
listener)
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ca6fb0651883

The building of synack messages was changed, which made it so
the skb->sk points to a casted request_sock. This is problematic,
as there is no sk_socket in a request_sock. So when the qtaguid_mt
function tries to access the sk->sk_socket, it accesses uninitialized
memory.

After looking at how other netfilter implementations handle this,
I realized there was a skb_to_full_sk() helper added, which the
xt_qtaguid code isn't yet using.

This patch adds its use, and resovles panics seen when accessing
uninitialzed memory when processing synack packets.

Change-Id: Id0dbb7853aba221c1926e44616524fed90677602
CRs-Fixed: 1035969
Reported-by: YongQin Liu <yongquin.liu@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Git-commit: 4e461c777e
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:49:09 -07:00
Amit Pundir
843033e005 Revert "net: activity_stats: Add statistics for network transmission activity"
This reverts commit afedd7beba.

Change-Id: Ibc9160b445254b0212c23664a94fd27b7788aa76
CRs-Fixed: 1035969
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 42d9422a80
Git-repo: https://android.googlesource.com/kernel/common/
[bflowers@codeaurora.org: Fix-up internal configs]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-07-28 19:47:52 -07:00
Venkat Gopalakrishnan
4667018ad7 scsi: ufs: return appropriate error code
If link recovery succeeds after a hibern8 exit failure,
return success as the link is active now for use.

Change-Id: I76ac226a2a1e33dd9c6240cac3443a03355bb75e
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2016-07-28 13:15:01 -07:00
Devesh Jhunjhunwala
f2509065e9 leds: qpnp-flash-v2: Create atomic notifier chain for flash irqs
Create an atomic notifier call chain to notify registered
clients of a flash-led irq event.

CRs-Fixed: 921325
Change-Id: I218195c29fede7ae5959df8c40df0231a71de379
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 12:43:30 -07:00
Chinmay Sawarkar
2e1c097214 ARM: dts: msm: By default, handle FW errors as fatal on msmcobalt
All FW errors such as SYS_ERROR, SESSION_ERROR and timeouts
will be treated as Fatal.

CRs-Fixed: 1037031
Change-Id: I12463f98cf50f5c8cdfdd47775dec075219974d6
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
2016-07-28 12:21:57 -07:00
Sudheer Papothi
712b785a73 ASoC: msm-cpe-lsm: add support for two CPE sessions
Existing CPE(Codec Processing Engine) driver supports single session.
Add support for two sessions with different sampling rates.

CRs-fixed: 1022917
Change-Id: Icb355cd07db9cc66632ac0ea14464c5610919725
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-07-28 11:20:07 -07:00
Devesh Jhunjhunwala
6b49283ec8 ARM: dts: msm: Add interrupts to flash-led device for pmicobalt
Add the all-ramp-up-done and all-ramp-down-done interrupts
to the flash-led device for pmicobalt. These interrupts will
be used to notify the flash-led clients when all leds have
completed ramping up or down after the flash is triggered.

CRs-Fixed: 921325
Change-Id: I39a6ba34e43dab8035bf232d0e640e72d7a34575
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 09:54:24 -07:00
Devesh Jhunjhunwala
6820e0c51b leds: qpnp-flash-v2: Add support to handle ramp up and down irqs
Add support to register and handle the all-ramp-up-done
and all-ramp-down-done irqs for flash-led.

CRs-Fixed: 921325
Change-Id: I843a008dbe6900f9f16c202a05435dbaf7a37627
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
2016-07-28 09:54:24 -07:00
Dhanalakshmi Siddani
78505032fe ASoC: msm: Implement HFP tx mute get function
Implement function to get HFP Tx mute status.

CRs-Fixed: 1045063
Change-Id: I64931decb9948ed47f046c0b6267150fe512a3dc
Signed-off-by: Dhanalakshmi Siddani <dsiddani@codeaurora.org>
2016-07-28 01:18:31 -07:00
Abinaya P
70dede533e input: it7258_ts_i2c: add DT parsing support for touch driver
Add device tree support for ITE Tech touch controller driver.

Change-Id: I2671b7c30b0f2ed1d7ad788f29b7f900a2a1cdcc
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-07-28 11:31:53 +05:30
Linux Build Service Account
956d9b1ab3 Merge "thermal: tsens: Remove registering for Critical trip zone" 2016-07-27 19:27:17 -07:00
Linux Build Service Account
006d8efe02 Merge "defconfig: msmcortex: Enable FG_GEN3 driver" 2016-07-27 19:27:15 -07:00
Linux Build Service Account
80d67524f5 Merge "defconfig: arm64: msm: enable CP15 barrier and SETEND simulation" 2016-07-27 19:27:14 -07:00
Linux Build Service Account
94a518173d Merge "msm: ipa3: add support for SMMU to USB" 2016-07-27 19:27:12 -07:00
Linux Build Service Account
b649d7e19b Merge "usb: f_gsi: Update connection parameters for GSI channels" 2016-07-27 19:27:11 -07:00
Linux Build Service Account
843ed09846 Merge "ASoC: wcd_cpe: Add support for two CPE sessions" 2016-07-27 19:27:09 -07:00
Linux Build Service Account
22393ab98f Merge "slim-msm: Synchronize SSR callbacks" 2016-07-27 19:27:08 -07:00
Linux Build Service Account
608c991c8e Merge "msm: kgsl: Map GPU QDSS STM through GPU IOMMU" 2016-07-27 19:27:07 -07:00
Linux Build Service Account
d4f1cec49f Merge "defconfig: Enable IOMMU debugfs in perf-defconfig" 2016-07-27 19:27:05 -07:00
Linux Build Service Account
484b6badfd Merge "msm: mdss: Update LM parameters during dest scaler transition" 2016-07-27 19:27:04 -07:00
Linux Build Service Account
af23db4098 Merge "thermal: qpnp-adc-tm: Update reverse threshold and notification" 2016-07-27 19:27:03 -07:00
Linux Build Service Account
f81c63bdae Merge "crypto: msm: enable hw crypto driver for msmfalcon" 2016-07-27 19:27:02 -07:00
Linux Build Service Account
6a45925f9a Merge "soc: qcom: build kryo perf events only for MSM8996" 2016-07-27 19:27:01 -07:00
Linux Build Service Account
71f2f97d61 Merge "input: ft5x06_ts: Add driver for ft5x06 series" 2016-07-27 19:27:01 -07:00
Linux Build Service Account
359db4da15 Merge "ASoC: Fix freed memory access of pcm stream kctl" 2016-07-27 19:26:59 -07:00
Linux Build Service Account
ea40856447 Merge "clk: msm: clock: Remove support for the USB cfg_ahb2phy clock from HLOS" 2016-07-27 19:26:58 -07:00
Linux Build Service Account
69493c178d Merge "usb: phy: Make cfg_ahb_clk optional" 2016-07-27 19:26:56 -07:00
Linux Build Service Account
fafc905174 Merge "msm: thermal: Update the hotplug initialization" 2016-07-27 19:26:55 -07:00
Linux Build Service Account
e3e38c9d58 Merge "ASoC: msm: qdsp6v2: Add size check in audio cal ioctl" 2016-07-27 19:26:54 -07:00
Linux Build Service Account
c7b518b18b Merge "clk: qcom: Porting display clocks from msm folder to qcom folder" 2016-07-27 19:26:53 -07:00
Linux Build Service Account
5f0e3bda7e Merge "ARM: dts: msm: Add the timeout property to BIMC SMMU GDSC on MSMCOBALT" 2016-07-27 19:26:52 -07:00
Linux Build Service Account
486e62947d Merge "sound: usb: Enable autosuspend for usb audio device" 2016-07-27 19:26:51 -07:00
Linux Build Service Account
d84f271674 Merge "msm: jpegdma: set minimum acceptable dimension as 8x8" 2016-07-27 19:26:48 -07:00
Linux Build Service Account
89c19762b9 Merge "soc: qcom: Make service locator call asynchronous" 2016-07-27 19:26:47 -07:00
Linux Build Service Account
df1777e959 Merge "crypto: msm: crypto driver performance improvement" 2016-07-27 19:26:46 -07:00
Linux Build Service Account
919a8b594b Merge "msm: mdss: Fix mixer extension offset" 2016-07-27 19:26:46 -07:00
Linux Build Service Account
3064b202a0 Merge "msm: ipa3: fix packet handling for multiple buffers" 2016-07-27 19:26:45 -07:00
Linux Build Service Account
0df01f7293 Merge "clk: msm: clock: Allow removing clock voltage votes during sleep" 2016-07-27 19:26:44 -07:00
Linux Build Service Account
45e147179a Merge "usb: dwc3: Fix NULL ptr dereference in ep disable ops" 2016-07-27 19:26:43 -07:00
Linux Build Service Account
258941eed9 Merge "clk: msm: hdmi: fix value of constant for minimum VCO rate" 2016-07-27 19:26:42 -07:00
Linux Build Service Account
729208c0c4 Merge "msm: mdss: Update backlight filter for AD" 2016-07-27 19:26:41 -07:00
Linux Build Service Account
6ae89be87e Merge "coresight-etm4x: avoid reading trace-id from ETM hardware block" 2016-07-27 19:26:40 -07:00
Linux Build Service Account
354d219f20 Merge "smb-lib: account for Jeita while distributing FCC" 2016-07-27 19:26:39 -07:00
Linux Build Service Account
27cb1fcd0a Merge "ARM: dts: msm: Update QUSB PHY device node compatible property on msmcobalt" 2016-07-27 19:26:36 -07:00
Linux Build Service Account
03fb272768 Merge "msm: jpegdma: Remove even number check for crop left and top" 2016-07-27 19:26:35 -07:00
Linux Build Service Account
b2371f9f83 Merge "netfilter: xt_qtaguid: seq_printf fixes" 2016-07-27 19:26:32 -07:00
Linux Build Service Account
8015befcec Merge "Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"" 2016-07-27 19:26:32 -07:00
Linux Build Service Account
0442f202ea Merge "Revert "misc: uidstat: avoid create_stat() race and blockage."" 2016-07-27 19:26:31 -07:00
Linux Build Service Account
0d6f04e288 Merge "Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"" 2016-07-27 19:26:31 -07:00