diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-12-30 23:44:20 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-30 23:44:37 +0200 |
| commit | 96d93de231c6f2e261efe1307c0e9d23d62f3075 (patch) | |
| tree | 5ba844e61b10f800a3731beaebf22d86a0438e3e /drivers/crypto | |
| parent | 1b938ff9f5f6ea7a746267a2dbdc3ffea872ff5a (diff) | |
| parent | 0427be586cf9a32339c8a851a1802f7d897cfb06 (diff) | |
Merge tag 'LA.UM.9.2.r1-01800-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-18.1-caf-msm8998
* tag 'LA.UM.9.2.r1-01800-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
sdm660-perf_defconfig changes
defconfig: msm8998: enable LEDS_QPNP_HAPTICS
HID: sony: Support PS4 BT
defconfig: msm8998: enable LEDS_QPNP_HAPTICS
ARM: dts: msm: Enable vibrator in msm8998
defconfig: Enable CONFIG_HID_NINTENDO for SDM660
FROMLIST: HID: nintendo: add nintendo switch controller driver
defconfig: Enable UTS_NS for sdm660
ANDROID: selinux: modify RTM_GETLINK permission
defconfig: Enable CONFIG_HID_NINTENDO for msm8998
defconfig: sdm660: enable LEDS_QPNP_HAPTICS
ARM: dts: msm: Enable vibrator in sdm660
defconfig: Enable CONFIG_UTS_NS for msm8998
RM: dts: msm: add CPU dai for additional proxy ports
msm: mdss: hdmi: parse physical screen dimensions from EDID
msm: kgsl: Compare pid pointer instead of TGID for a new process
binder: fix UAF when releasing todo list
crypto: Fix possible stack out of bound error
mdss_hdmi_tx: reset HDR flags on disconnect
soc: add proxy ports for call screening in machine driver
msm: isp2: fix close sequence of isp stats stream
usb: dwc3: ep0: Return from handle_status if ep0_delegate_req succeeds
Revert "include: Fix for compilation issue"
msm: kgsl: Mark the scratch buffer as privileged
include: Fix for compilation issue
Conflicts:
drivers/hid/Makefile
security/selinux/ss/services.c
Change-Id: Ia1f388435462703697ec52f6702b47f6653791df
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/msm/qce.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/crypto/msm/qce.c b/drivers/crypto/msm/qce.c index 4cf95b90a2df..53c07aacc145 100644 --- a/drivers/crypto/msm/qce.c +++ b/drivers/crypto/msm/qce.c @@ -1,6 +1,6 @@ /* Qualcomm Crypto Engine driver. * - * Copyright (c) 2010-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2016, 2020 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -768,6 +768,11 @@ static int _ce_setup(struct qce_device *pce_dev, struct qce_req *q_req, switch (q_req->alg) { case CIPHER_ALG_DES: if (q_req->mode != QCE_MODE_ECB) { + if (ivsize > MAX_IV_LENGTH) { + pr_err("%s: error: Invalid length parameter\n", + __func__); + return -EINVAL; + } _byte_stream_to_net_words(enciv32, q_req->iv, ivsize); writel_relaxed(enciv32[0], pce_dev->iobase + CRYPTO_CNTR0_IV0_REG); |