Commit graph

574527 commits

Author SHA1 Message Date
Kirill Tkhai
92d978db31 ext4 crypto: fix memleak in ext4_readdir()
When ext4_bread() fails, fname_crypto_str remains
allocated after return. Fix that.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
CC: Dmitry Monakhov <dmonakhov@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Change-Id: Id3fc6ad39f771a0dbcab0c46a2df4f29cdb398f0
Git-commit: 7bf19038854f2bda589db4224124dee11968cdf3
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:19:12 -07:00
Theodore Ts'o
1a96d6dcbf ext4 crypto: revalidate dentry after adding or removing the key
Add a validation check for dentries for encrypted directory to make
sure we're not caching stale data after a key has been added or removed.

Also check to make sure that status of the encryption key is updated
when readdir(2) is executed.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@google.com>
Git-commit: b4fd46149cbb118c6c2fa29f24391e79b87862b7
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Change-Id: I64ea95854de3c633b17bea0b63ab658e1524befb
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2016-09-07 01:18:38 -07:00
Linux Build Service Account
11d6060fff Merge "ASoC: wcd934x: Update codec master clock configuration" 2016-09-05 16:21:42 -07:00
Linux Build Service Account
eb09c5c879 Merge "ASoC: wcd934x: Fix register default for MAD buffer interval" 2016-09-05 16:21:41 -07:00
Linux Build Service Account
b1750ed67d Merge "msm: mdss: fix adaptive variable refresh and dynamic fps concurrency" 2016-09-02 13:52:54 -07:00
Linux Build Service Account
a48893e202 Merge "usb: phy: handle phy related regulators properly" 2016-09-02 13:52:53 -07:00
Linux Build Service Account
8965988fff Merge "input: ft5x06_ts: add sysfs to access touch module info" 2016-09-02 13:52:49 -07:00
Linux Build Service Account
c1786b559a Merge "input: ft5x06_ts: remove proximity sensor support" 2016-09-02 13:52:49 -07:00
Linux Build Service Account
1e7b2ab2a9 Merge "qcom-charger: smb138x: update FCC settings in smb_params table" 2016-09-02 13:52:48 -07:00
Linux Build Service Account
79317e6d4c Merge "qcom-charger: smb2: configure stat pin for parallel charging" 2016-09-02 13:52:47 -07:00
Linux Build Service Account
60e9bbd784 Merge "msm: ipa3: Fix timeout period of IPA resource add dependency" 2016-09-02 13:52:47 -07:00
Linux Build Service Account
11b7d7db0a Merge "Replace %p with %pK to prevent leaking kernel address" 2016-09-02 13:52:46 -07:00
Linux Build Service Account
cd601585c7 Merge "diag: Do not open glink channel twice" 2016-09-02 13:52:45 -07:00
Linux Build Service Account
91cdbb3b49 Merge "msm: ipa3: Fix wrong parameter to xdci release function" 2016-09-02 13:52:45 -07:00
Linux Build Service Account
24461c58d0 Merge "ARM: dts: msm: Update qusb2 efuse address for msmcobalt-v2" 2016-09-02 13:52:42 -07:00
Linux Build Service Account
46f0a3bc85 Merge "usb: phy: qusb: Update tune1 param from efuse register" 2016-09-02 13:52:42 -07:00
Linux Build Service Account
197b415098 Merge "tty: serial: msm: Add runtime PM and system sleep support" 2016-09-02 13:52:41 -07:00
Linux Build Service Account
6f11633832 Merge "netfilter: xt_quota2: 3.18 netlink notification fix" 2016-09-02 13:52:40 -07:00
Linux Build Service Account
604de7297c Merge "usb: dwc3: restart usb upon endpoint cmd timeout" 2016-09-02 13:52:40 -07:00
Linux Build Service Account
20a10f5e22 Merge "ipv4/GRO: Make GRO conform to RFC 6864" 2016-09-02 13:52:39 -07:00
Linux Build Service Account
aa1a5a622d Merge "ext4 crypto: simplify interfaces to directory entry insert functions" 2016-09-02 13:52:38 -07:00
Linux Build Service Account
12bc3939ae Merge "msm: mdss: Initialize pp_sts variable before use" 2016-09-02 13:52:38 -07:00
Linux Build Service Account
b7ab2d6533 Merge "qcom-charger: introduce step charging" 2016-09-02 13:52:37 -07:00
Linux Build Service Account
01bea452a4 Merge "msm: ipa3: fix GSI ring DMA allocation parameters" 2016-09-02 13:52:36 -07:00
Linux Build Service Account
b5a699fa3f Merge "clk: msm: Add support for block reset clocks for msmcobalt" 2016-09-02 13:52:35 -07:00
Linux Build Service Account
0af361645e Merge "ARM: dts: msm: change ebi buswidth for msmhamster" 2016-09-02 13:52:35 -07:00
Linux Build Service Account
86ed229775 Merge "nf: xt_qtaguid: fix handling for cases where tunnels are used." 2016-09-02 13:52:34 -07:00
Linux Build Service Account
d48d1c2287 Merge "msm: sde: Fix SMMU fault in SDE rotator for secure playback" 2016-09-02 13:52:33 -07:00
Linux Build Service Account
ce208ebb32 Merge "ARM: dts: msm: add 2 lane support for msmcobalt ufs phy" 2016-09-02 13:52:32 -07:00
Linux Build Service Account
90d089418c Merge "qseecom: improve listener resp processing if app is blocked" 2016-09-02 13:52:32 -07:00
Linux Build Service Account
48b6724178 Merge "msm: sde: Fix SDE rotator driver error handling" 2016-09-02 13:52:31 -07:00
Linux Build Service Account
8309f6afda Merge "msm: ipa: fix potential race condition ioctls" 2016-09-02 13:52:30 -07:00
Linux Build Service Account
40b4ea195d Merge "cnss: Reset QCA Card during WLAN SubSystem Recovery" 2016-09-02 13:52:29 -07:00
Linux Build Service Account
e6fe53412e Merge "scsi: ufs: Initiate crypto before SCSI for UFS fast boot" 2016-09-02 13:52:28 -07:00
Linux Build Service Account
d9fed05410 Merge "cfg80211: Add option to specify previous BSSID for Connect command" 2016-09-02 13:52:27 -07:00
Linux Build Service Account
01b7812ef9 Merge "cfg80211: Define macro to indicate prev_bssid connect support" 2016-09-02 13:52:26 -07:00
Linux Build Service Account
d95f7bea18 Merge "soc: qcom: glink: Validate ctx before using" 2016-09-02 13:52:25 -07:00
Linux Build Service Account
ca667c3ef5 Merge "mutex: Add a delay into the SPIN_ON_OWNER wait loop." 2016-09-02 13:52:24 -07:00
Linux Build Service Account
cf923055eb Merge "net: ipc_router: Fix remote port conn_info memory leak" 2016-09-02 13:52:24 -07:00
Linux Build Service Account
da1845f69c Merge "host: sdhci-msm: implement get_current_limit() host op" 2016-09-02 13:52:23 -07:00
Linux Build Service Account
3fa0d6f138 Merge "diag: Add error handler to free buffers when fwd fails" 2016-09-02 13:52:22 -07:00
Linux Build Service Account
0e34d5ec1c Merge "icnss: Shutdown only if probed" 2016-09-02 13:52:20 -07:00
Linux Build Service Account
4e06ee349f Merge "icnss: Fix NULL pointer dererference" 2016-09-02 13:52:20 -07:00
Linux Build Service Account
a278b7c5a4 Merge "defconfig: msmcortex: enable QCOM_TADC driver" 2016-09-02 13:52:18 -07:00
Linux Build Service Account
e5e464d857 Merge "defconfig: msm: enable common log for msmcobalt" 2016-09-02 13:52:17 -07:00
Linux Build Service Account
d03c5b32e3 Merge "msm: camera: secure camera support" 2016-09-02 13:52:17 -07:00
Linux Build Service Account
c4aaae0d6a Merge "msm: camera: isp: Use single stream for dual vfe" 2016-09-02 13:52:15 -07:00
Linux Build Service Account
8e942d7343 Merge "coresight-stm: let runtime PM handle core clock" 2016-09-02 13:52:14 -07:00
Linux Build Service Account
7854019283 Merge "msm: sensor: Add support for querying flash max current" 2016-09-02 13:52:14 -07:00
Linux Build Service Account
f7e6d28c0b Merge "msm: mdss: increase mdp hw recovery timeout" 2016-09-02 13:52:13 -07:00