- Linux-stable-mirror - lists.linaro.org

[PATCH] crypto: rockchip - update IV buffer to contain the next IV

by Zhang Zhijie

The Kernel Crypto API request output the next IV data to IV buffer for CBC implementation. So the last block data of ciphertext should be copid into assigned IV buffer. Reported-by: Eric Biggers <ebiggers(a)google.com> Fixes: 433cd2c617bf ("crypto: rockchip - add crypto driver for rk3288") Cc: <stable(a)vger.kernel.org> # v4.5+ Signed-off-by: Zhang Zhijie <zhangzj(a)rock-chips.com> diff --git a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c index 02dac6ae7e53..7564b4c41afc 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c @@ -250,9 +250,14 @@ static int rk_set_data_start(struct rk_crypto_info *dev) u8 *src_last_blk = page_address(sg_page(dev->sg_src)) + dev->sg_src->offset + dev->sg_src->length - ivsize; - /* store the iv that need to be updated in chain mode */ - if (ctx->mode & RK_CRYPTO_DEC) + /* Store the iv that need to be updated in chain mode. + * And update the IV buffer to contain the next IV for decryption mode. + */ + if (ctx->mode & RK_CRYPTO_DEC) { memcpy(ctx->iv, src_last_blk, ivsize); + sg_pcopy_to_buffer(dev->first, dev->src_nents, req->info, + ivsize, dev->total - ivsize); + } err = dev->load_data(dev, dev->sg_src, dev->sg_dst); if (!err) @@ -288,13 +293,19 @@ static void rk_iv_copyback(struct rk_crypto_info *dev) struct ablkcipher_request *req = ablkcipher_request_cast(dev->async_req); struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req); + struct rk_cipher_ctx *ctx = crypto_ablkcipher_ctx(tfm); u32 ivsize = crypto_ablkcipher_ivsize(tfm); - if (ivsize == DES_BLOCK_SIZE) - memcpy_fromio(req->info, dev->reg + RK_CRYPTO_TDES_IV_0, - ivsize); - else if (ivsize == AES_BLOCK_SIZE) - memcpy_fromio(req->info, dev->reg + RK_CRYPTO_AES_IV_0, ivsize); + /* Update the IV buffer to contain the next IV for encryption mode. */ + if (!(ctx->mode & RK_CRYPTO_DEC)) { + if (dev->aligned) { + memcpy(req->info, sg_virt(dev->sg_dst) + + dev->sg_dst->length - ivsize, ivsize); + } else { + memcpy(req->info, dev->addr_vir + + dev->count - ivsize, ivsize); + } + } } static void rk_update_iv(struct rk_crypto_info *dev) -- 2.17.1

6 years, 5 months

2
1
0 0

[PATCH] crypto: ccp: Do not free psp_master when PLATFORM_INIT fails

by Singh, Brijesh

Currently, we free the psp_master if the PLATFORM_INIT fails during the SEV FW probe. If psp_master is freed then driver does not invoke the PSP FW. As per SEV FW spec, there are several commands (PLATFORM_RESET, PLATFORM_STATUS, GET_ID etc) which can be executed in the UNINIT state We should not free the psp_master when PLATFORM_INIT fails. Fixes: 200664d5237f ("crypto: ccp: Add SEV support") Cc: Tom Lendacky <thomas.lendacky(a)amd.com> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Cc: Gary Hook <gary.hook(a)amd.com> Cc: stable(a)vger.kernel.org # 4.19.y Signed-off-by: Brijesh Singh <brijesh.singh(a)amd.com> --- drivers/crypto/ccp/psp-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 80a59be9c80d..656838433f2f 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -1064,7 +1064,7 @@ void psp_pci_init(void) rc = sev_platform_init(&error); if (rc) { dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error); - goto err; + return; } dev_info(sp->dev, "SEV API:%d.%d build:%d\n", psp_master->api_major, -- 2.17.1

6 years, 5 months

2
1
0 0

[PATCH 35/35] crypto: ccree: handle tee fips error during power management resume

by Gilad Ben-Yossef

From: Ofir Drang <ofir.drang(a)arm.com> in order to support cryptocell tee fips error that may occurs while cryptocell ree is suspended, an cc_tee_handle_fips_error call added to the cc_pm_resume function. Signed-off-by: Ofir Drang <ofir.drang(a)arm.com> Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 77025da2dcb6..2dad9c9543c6 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -11,6 +11,7 @@ #include "cc_ivgen.h" #include "cc_hash.h" #include "cc_pm.h" +#include "cc_fips.h" #define POWER_DOWN_ENABLE 0x01 #define POWER_DOWN_DISABLE 0x00 @@ -50,12 +51,13 @@ int cc_pm_resume(struct device *dev) } cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE); - rc = init_cc_regs(drvdata, false); if (rc) { dev_err(dev, "init_cc_regs (%x)\n", rc); return rc; } + /* check if tee fips error occurred during power down */ + cc_tee_handle_fips_error(drvdata); rc = cc_resume_req_queue(drvdata); if (rc) { -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 34/35] crypto: ccree: add function to handle cryptocell tee fips error

by Gilad Ben-Yossef

From: Ofir Drang <ofir.drang(a)arm.com> Adds function that checks if cryptocell tee fips error occurred and in such case triggers system error through kernel panic. Change fips function to use this new routine. Signed-off-by: Ofir Drang <ofir.drang(a)arm.com> Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_fips.c | 23 +++++++++++++++-------- drivers/crypto/ccree/cc_fips.h | 2 ++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/ccree/cc_fips.c b/drivers/crypto/ccree/cc_fips.c index 4a67248f5625..5ad3ffb7acaa 100644 --- a/drivers/crypto/ccree/cc_fips.c +++ b/drivers/crypto/ccree/cc_fips.c @@ -70,20 +70,28 @@ static inline void tee_fips_error(struct device *dev) dev_err(dev, "TEE reported error!\n"); } +/* + * This function check if cryptocell tee fips error occurred + * and in such case triggers system error + */ +void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata) +{ + struct device *dev = drvdata_to_dev(p_drvdata); + + if (!cc_get_tee_fips_status(p_drvdata)) + tee_fips_error(dev); +} + /* Deferred service handler, run as interrupt-fired tasklet */ static void fips_dsr(unsigned long devarg) { struct cc_drvdata *drvdata = (struct cc_drvdata *)devarg; - struct device *dev = drvdata_to_dev(drvdata); - u32 irq, state, val; + u32 irq, val; irq = (drvdata->irq & (CC_GPR0_IRQ_MASK)); if (irq) { - state = cc_ioread(drvdata, CC_REG(GPR_HOST)); - - if (state != (CC_FIPS_SYNC_TEE_STATUS | CC_FIPS_SYNC_MODULE_OK)) - tee_fips_error(dev); + cc_tee_handle_fips_error(drvdata); } /* after verifing that there is nothing to do, @@ -111,8 +119,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata) dev_dbg(dev, "Initializing fips tasklet\n"); tasklet_init(&fips_h->tasklet, fips_dsr, (unsigned long)p_drvdata); - if (!cc_get_tee_fips_status(p_drvdata)) - tee_fips_error(dev); + cc_tee_handle_fips_error(p_drvdata); return 0; } diff --git a/drivers/crypto/ccree/cc_fips.h b/drivers/crypto/ccree/cc_fips.h index 2c287faf10ff..fc33eeb4d566 100644 --- a/drivers/crypto/ccree/cc_fips.h +++ b/drivers/crypto/ccree/cc_fips.h @@ -18,6 +18,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata); void cc_fips_fini(struct cc_drvdata *drvdata); void fips_handler(struct cc_drvdata *drvdata); void cc_set_ree_fips_status(struct cc_drvdata *drvdata, bool ok); +void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata); #else /* CONFIG_CRYPTO_FIPS */ @@ -30,6 +31,7 @@ static inline void cc_fips_fini(struct cc_drvdata *drvdata) {} static inline void cc_set_ree_fips_status(struct cc_drvdata *drvdata, bool ok) {} static inline void fips_handler(struct cc_drvdata *drvdata) {} +static inline void cc_tee_handle_fips_error(struct cc_drvdata *p_drvdata) {} #endif /* CONFIG_CRYPTO_FIPS */ -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 33/35] crypto: ccree: HOST_POWER_DOWN_EN should be the last CC access during suspend

by Gilad Ben-Yossef

From: Ofir Drang <ofir.drang(a)arm.com> During power management suspend the driver need to prepare the device for the power down operation and as a last indication write to the HOST_POWER_DOWN_EN register which signals to the hardware that The ccree is ready for power down. Signed-off-by: Ofir Drang <ofir.drang(a)arm.com> Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 9a5abe406996..77025da2dcb6 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -25,13 +25,13 @@ int cc_pm_suspend(struct device *dev) int rc; dev_dbg(dev, "set HOST_POWER_DOWN_EN\n"); - cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE); rc = cc_suspend_req_queue(drvdata); if (rc) { dev_err(dev, "cc_suspend_req_queue (%x)\n", rc); return rc; } fini_cc_regs(drvdata); + cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE); cc_clk_off(drvdata); return 0; } -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 31/35] crypto: ccree: pm resume first enable the source clk

by Gilad Ben-Yossef

From: Ofir Drang <ofir.drang(a)arm.com> On power management resume function first enable the device clk source to allow access to the device registers. Signed-off-by: Ofir Drang <ofir.drang(a)arm.com> Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_pm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c index 6f278a0d8ee6..9a5abe406996 100644 --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -42,14 +42,15 @@ int cc_pm_resume(struct device *dev) struct cc_drvdata *drvdata = dev_get_drvdata(dev); dev_dbg(dev, "unset HOST_POWER_DOWN_EN\n"); - cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE); - + /* Enables the device source clk */ rc = cc_clk_on(drvdata); if (rc) { dev_err(dev, "failed getting clock back on. We're toast.\n"); return rc; } + cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE); + rc = init_cc_regs(drvdata, false); if (rc) { dev_err(dev, "init_cc_regs (%x)\n", rc); -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 30/35] crypto: ccree: don't map AEAD key and IV on stack

by Gilad Ben-Yossef

The AEAD authenc key and IVs might be passed to us on stack. Copy it to a slab buffer before mapping to gurantee proper DMA mapping. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_aead.c | 11 ++++++++++- drivers/crypto/ccree/cc_buffer_mgr.c | 15 ++++++++++++--- drivers/crypto/ccree/cc_driver.h | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c index 7447fd0ff48e..ca44a227b211 100644 --- a/drivers/crypto/ccree/cc_aead.c +++ b/drivers/crypto/ccree/cc_aead.c @@ -424,7 +424,7 @@ static int validate_keys_sizes(struct cc_aead_ctx *ctx) /* This function prepers the user key so it can pass to the hmac processing * (copy to intenral buffer or hash in case of key longer than block */ -static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, +static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *authkey, unsigned int keylen) { dma_addr_t key_dma_addr = 0; @@ -437,6 +437,7 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, unsigned int hashmode; unsigned int idx = 0; int rc = 0; + u8 *key = NULL; struct cc_hw_desc desc[MAX_AEAD_SETKEY_SEQ]; dma_addr_t padded_authkey_dma_addr = ctx->auth_state.hmac.padded_authkey_dma_addr; @@ -455,11 +456,17 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, } if (keylen != 0) { + + key = kmemdup(authkey, keylen, GFP_KERNEL); + if (!key) + return -ENOMEM; + key_dma_addr = dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE); if (dma_mapping_error(dev, key_dma_addr)) { dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n", key, keylen); + kzfree(key); return -ENOMEM; } if (keylen > blocksize) { @@ -542,6 +549,8 @@ static int cc_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, if (key_dma_addr) dma_unmap_single(dev, key_dma_addr, keylen, DMA_TO_DEVICE); + kzfree(key); + return rc; } diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c index 09dceec7d828..c81ad33f9115 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -557,6 +557,7 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) if (areq_ctx->gen_ctx.iv_dma_addr) { dma_unmap_single(dev, areq_ctx->gen_ctx.iv_dma_addr, hw_iv_size, DMA_BIDIRECTIONAL); + kzfree(areq_ctx->gen_ctx.iv); } /* Release pool */ @@ -607,19 +608,27 @@ static int cc_aead_chain_iv(struct cc_drvdata *drvdata, struct aead_req_ctx *areq_ctx = aead_request_ctx(req); unsigned int hw_iv_size = areq_ctx->hw_iv_size; struct device *dev = drvdata_to_dev(drvdata); + gfp_t flags = cc_gfp_flags(&req->base); int rc = 0; if (!req->iv) { areq_ctx->gen_ctx.iv_dma_addr = 0; + areq_ctx->gen_ctx.iv = NULL; goto chain_iv_exit; } - areq_ctx->gen_ctx.iv_dma_addr = dma_map_single(dev, req->iv, - hw_iv_size, - DMA_BIDIRECTIONAL); + areq_ctx->gen_ctx.iv = kmemdup(req->iv, hw_iv_size, flags); + if (!areq_ctx->gen_ctx.iv) + return -ENOMEM; + + areq_ctx->gen_ctx.iv_dma_addr = + dma_map_single(dev, areq_ctx->gen_ctx.iv, hw_iv_size, + DMA_BIDIRECTIONAL); if (dma_mapping_error(dev, areq_ctx->gen_ctx.iv_dma_addr)) { dev_err(dev, "Mapping iv %u B at va=%pK for DMA failed\n", hw_iv_size, req->iv); + kzfree(areq_ctx->gen_ctx.iv); + areq_ctx->gen_ctx.iv = NULL; rc = -ENOMEM; goto chain_iv_exit; } diff --git a/drivers/crypto/ccree/cc_driver.h b/drivers/crypto/ccree/cc_driver.h index 935ae0ba75c0..cc403d705c9d 100644 --- a/drivers/crypto/ccree/cc_driver.h +++ b/drivers/crypto/ccree/cc_driver.h @@ -204,6 +204,7 @@ struct cc_alg_template { struct async_gen_req_ctx { dma_addr_t iv_dma_addr; + u8 *iv; enum drv_crypto_direction op_type; }; -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 29/35] crypto: ccree: don't map MAC key on stack

by Gilad Ben-Yossef

The MAC hash key might be passed to us on stack. Copy it to a slab buffer before mapping to gurantee proper DMA mapping. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_hash.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c index 36e9fb4141f8..a6abe4e3bb0e 100644 --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c @@ -69,6 +69,7 @@ struct cc_hash_alg { struct hash_key_req_ctx { u32 keylen; dma_addr_t key_dma_addr; + u8 *key; }; /* hash per-session context */ @@ -742,13 +743,20 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key, ctx->key_params.keylen = keylen; ctx->key_params.key_dma_addr = 0; ctx->is_hmac = true; + ctx->key_params.key = NULL; if (keylen) { + ctx->key_params.key = kmemdup(key, keylen, GFP_KERNEL); + if (!ctx->key_params.key) + return -ENOMEM; + ctx->key_params.key_dma_addr = - dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE); + dma_map_single(dev, (void *)ctx->key_params.key, keylen, + DMA_TO_DEVICE); if (dma_mapping_error(dev, ctx->key_params.key_dma_addr)) { dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n", - key, keylen); + ctx->key_params.key, keylen); + kzfree(ctx->key_params.key); return -ENOMEM; } dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n", @@ -899,6 +907,9 @@ static int cc_hash_setkey(struct crypto_ahash *ahash, const u8 *key, dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n", &ctx->key_params.key_dma_addr, ctx->key_params.keylen); } + + kzfree(ctx->key_params.key); + return rc; } @@ -925,11 +936,16 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash, ctx->key_params.keylen = keylen; + ctx->key_params.key = kmemdup(key, keylen, GFP_KERNEL); + if (!ctx->key_params.key) + return -ENOMEM; + ctx->key_params.key_dma_addr = - dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE); + dma_map_single(dev, ctx->key_params.key, keylen, DMA_TO_DEVICE); if (dma_mapping_error(dev, ctx->key_params.key_dma_addr)) { dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n", key, keylen); + kzfree(ctx->key_params.key); return -ENOMEM; } dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n", @@ -981,6 +997,8 @@ static int cc_xcbc_setkey(struct crypto_ahash *ahash, dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n", &ctx->key_params.key_dma_addr, ctx->key_params.keylen); + kzfree(ctx->key_params.key); + return rc; } -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 27/35] crypto: ccree: use correct internal state sizes for export

by Gilad Ben-Yossef

We were computing the size of the import buffer based on the digest size but the 318 and 224 byte variants use 512 and 256 bytes internal state sizes respectfully, thus causing the import buffer to overrun. Fix it by using the right sizes. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c index 940101fee68e..36e9fb4141f8 100644 --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c @@ -1633,7 +1633,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA224_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA224_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA256_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA224, @@ -1660,7 +1660,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA384_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA384_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA512_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA384, -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 26/35] crypto: ccree: zap entire sg on aead request unmap

by Gilad Ben-Yossef

We were trying to be clever zapping out of the cache only the required length out of scatter list on AEAD request completion and getting it wrong. As Knuth said: "when in douby, use brute force". Zap the whole length of the scatter list. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_buffer_mgr.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c index fa625bdde3f9..09dceec7d828 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -517,9 +517,7 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) { struct aead_req_ctx *areq_ctx = aead_request_ctx(req); unsigned int hw_iv_size = areq_ctx->hw_iv_size; - struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct cc_drvdata *drvdata = dev_get_drvdata(dev); - u32 size_to_unmap = 0; if (areq_ctx->mac_buf_dma_addr) { dma_unmap_single(dev, areq_ctx->mac_buf_dma_addr, @@ -576,19 +574,12 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) dev_dbg(dev, "Unmapping src sgl: req->src=%pK areq_ctx->src.nents=%u areq_ctx->assoc.nents=%u assoclen:%u cryptlen=%u\n", sg_virt(req->src), areq_ctx->src.nents, areq_ctx->assoc.nents, areq_ctx->assoclen, req->cryptlen); - size_to_unmap = areq_ctx->assoclen + req->cryptlen; - if (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_ENCRYPT) - size_to_unmap += areq_ctx->req_authsize; - if (areq_ctx->is_gcm4543) - size_to_unmap += crypto_aead_ivsize(tfm); - dma_unmap_sg(dev, req->src, sg_nents_for_len(req->src, size_to_unmap), - DMA_BIDIRECTIONAL); + dma_unmap_sg(dev, req->src, sg_nents(req->src), DMA_BIDIRECTIONAL); if (req->src != req->dst) { dev_dbg(dev, "Unmapping dst sgl: req->dst=%pK\n", sg_virt(req->dst)); - dma_unmap_sg(dev, req->dst, - sg_nents_for_len(req->dst, size_to_unmap), + dma_unmap_sg(dev, req->dst, sg_nents(req->dst), DMA_BIDIRECTIONAL); } if (drvdata->coherent && -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 15/35] crypto: ccree: fix mem leak on error path

by Gilad Ben-Yossef

Fix a memory leak on the error path of IV generation code. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_ivgen.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/ccree/cc_ivgen.c b/drivers/crypto/ccree/cc_ivgen.c index 769458323394..1abec3896a78 100644 --- a/drivers/crypto/ccree/cc_ivgen.c +++ b/drivers/crypto/ccree/cc_ivgen.c @@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata) } ivgen_ctx->pool = NULL_SRAM_ADDR; - - /* release "this" context */ - kfree(ivgen_ctx); } /*! @@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) int rc; /* Allocate "this" context */ - ivgen_ctx = kzalloc(sizeof(*ivgen_ctx), GFP_KERNEL); + ivgen_ctx = devm_kzalloc(device, sizeof(*ivgen_ctx), GFP_KERNEL); if (!ivgen_ctx) return -ENOMEM; + drvdata->ivgen_handle = ivgen_ctx; + /* Allocate pool's header for initial enc. key/IV */ ivgen_ctx->pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE, &ivgen_ctx->pool_meta_dma, @@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) goto out; } - drvdata->ivgen_handle = ivgen_ctx; - return cc_init_iv_sram(drvdata); out: -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 13/35] crypto: ccree: remove special handling of chained sg

by Gilad Ben-Yossef

We were handling chained scattergather lists with specialized code needlessly as the regular sg APIs handle them just fine. The code handling this also had an (unused) code path with a use-before-init error, flagged by Coverity. Remove all special handling of chained sg and leave their handling to the regular sg APIs. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_buffer_mgr.c | 98 +++++++--------------------- 1 file changed, 22 insertions(+), 76 deletions(-) diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c index adef3cfa1251..7c92373df351 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -83,24 +83,17 @@ static void cc_copy_mac(struct device *dev, struct aead_request *req, */ static unsigned int cc_get_sgl_nents(struct device *dev, struct scatterlist *sg_list, - unsigned int nbytes, u32 *lbytes, - bool *is_chained) + unsigned int nbytes, u32 *lbytes) { unsigned int nents = 0; while (nbytes && sg_list) { - if (sg_list->length) { - nents++; - /* get the number of bytes in the last entry */ - *lbytes = nbytes; - nbytes -= (sg_list->length > nbytes) ? - nbytes : sg_list->length; - sg_list = sg_next(sg_list); - } else { - sg_list = (struct scatterlist *)sg_page(sg_list); - if (is_chained) - *is_chained = true; - } + nents++; + /* get the number of bytes in the last entry */ + *lbytes = nbytes; + nbytes -= (sg_list->length > nbytes) ? + nbytes : sg_list->length; + sg_list = sg_next(sg_list); } dev_dbg(dev, "nents %d last bytes %d\n", nents, *lbytes); return nents; @@ -142,7 +135,7 @@ void cc_copy_sg_portion(struct device *dev, u8 *dest, struct scatterlist *sg, { u32 nents, lbytes; - nents = cc_get_sgl_nents(dev, sg, end, &lbytes, NULL); + nents = cc_get_sgl_nents(dev, sg, end, &lbytes); sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip, (direct == CC_SG_TO_BUF)); } @@ -314,40 +307,10 @@ static void cc_add_sg_entry(struct device *dev, struct buffer_array *sgl_data, sgl_data->num_of_buffers++; } -static int cc_dma_map_sg(struct device *dev, struct scatterlist *sg, u32 nents, - enum dma_data_direction direction) -{ - u32 i, j; - struct scatterlist *l_sg = sg; - - for (i = 0; i < nents; i++) { - if (!l_sg) - break; - if (dma_map_sg(dev, l_sg, 1, direction) != 1) { - dev_err(dev, "dma_map_page() sg buffer failed\n"); - goto err; - } - l_sg = sg_next(l_sg); - } - return nents; - -err: - /* Restore mapped parts */ - for (j = 0; j < i; j++) { - if (!sg) - break; - dma_unmap_sg(dev, sg, 1, direction); - sg = sg_next(sg); - } - return 0; -} - static int cc_map_sg(struct device *dev, struct scatterlist *sg, unsigned int nbytes, int direction, u32 *nents, u32 max_sg_nents, u32 *lbytes, u32 *mapped_nents) { - bool is_chained = false; - if (sg_is_last(sg)) { /* One entry only case -set to DLLI */ if (dma_map_sg(dev, sg, 1, direction) != 1) { @@ -361,35 +324,21 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg, *nents = 1; *mapped_nents = 1; } else { /*sg_is_last*/ - *nents = cc_get_sgl_nents(dev, sg, nbytes, lbytes, - &is_chained); + *nents = cc_get_sgl_nents(dev, sg, nbytes, lbytes); if (*nents > max_sg_nents) { *nents = 0; dev_err(dev, "Too many fragments. current %d max %d\n", *nents, max_sg_nents); return -ENOMEM; } - if (!is_chained) { - /* In case of mmu the number of mapped nents might - * be changed from the original sgl nents - */ - *mapped_nents = dma_map_sg(dev, sg, *nents, direction); - if (*mapped_nents == 0) { - *nents = 0; - dev_err(dev, "dma_map_sg() sg buffer failed\n"); - return -ENOMEM; - } - } else { - /*In this case the driver maps entry by entry so it - * must have the same nents before and after map - */ - *mapped_nents = cc_dma_map_sg(dev, sg, *nents, - direction); - if (*mapped_nents != *nents) { - *nents = *mapped_nents; - dev_err(dev, "dma_map_sg() sg buffer failed\n"); - return -ENOMEM; - } + /* In case of mmu the number of mapped nents might + * be changed from the original sgl nents + */ + *mapped_nents = dma_map_sg(dev, sg, *nents, direction); + if (*mapped_nents == 0) { + *nents = 0; + dev_err(dev, "dma_map_sg() sg buffer failed\n"); + return -ENOMEM; } } @@ -571,7 +520,6 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct cc_drvdata *drvdata = dev_get_drvdata(dev); u32 dummy; - bool chained; u32 size_to_unmap = 0; if (areq_ctx->mac_buf_dma_addr) { @@ -636,15 +584,14 @@ void cc_unmap_aead_request(struct device *dev, struct aead_request *req) size_to_unmap += crypto_aead_ivsize(tfm); dma_unmap_sg(dev, req->src, - cc_get_sgl_nents(dev, req->src, size_to_unmap, - &dummy, &chained), + cc_get_sgl_nents(dev, req->src, size_to_unmap, &dummy), DMA_BIDIRECTIONAL); if (req->src != req->dst) { dev_dbg(dev, "Unmapping dst sgl: req->dst=%pK\n", sg_virt(req->dst)); dma_unmap_sg(dev, req->dst, cc_get_sgl_nents(dev, req->dst, size_to_unmap, - &dummy, &chained), + &dummy), DMA_BIDIRECTIONAL); } if (drvdata->coherent && @@ -1022,7 +969,6 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata, unsigned int size_for_map = req->assoclen + req->cryptlen; struct crypto_aead *tfm = crypto_aead_reqtfm(req); u32 sg_index = 0; - bool chained = false; bool is_gcm4543 = areq_ctx->is_gcm4543; u32 size_to_skip = req->assoclen; @@ -1043,7 +989,7 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata, size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? authsize : 0; src_mapped_nents = cc_get_sgl_nents(dev, req->src, size_for_map, - &src_last_bytes, &chained); + &src_last_bytes); sg_index = areq_ctx->src_sgl->length; //check where the data starts while (sg_index <= size_to_skip) { @@ -1083,7 +1029,7 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata, } dst_mapped_nents = cc_get_sgl_nents(dev, req->dst, size_for_map, - &dst_last_bytes, &chained); + &dst_last_bytes); sg_index = areq_ctx->dst_sgl->length; offset = size_to_skip; @@ -1484,7 +1430,7 @@ int cc_map_hash_request_update(struct cc_drvdata *drvdata, void *ctx, dev_dbg(dev, " less than one block: curr_buff=%pK *curr_buff_cnt=0x%X copy_to=%pK\n", curr_buff, *curr_buff_cnt, &curr_buff[*curr_buff_cnt]); areq_ctx->in_nents = - cc_get_sgl_nents(dev, src, nbytes, &dummy, NULL); + cc_get_sgl_nents(dev, src, nbytes, &dummy); sg_copy_to_buffer(src, areq_ctx->in_nents, &curr_buff[*curr_buff_cnt], nbytes); *curr_buff_cnt += nbytes; -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH 11/35] crypto: ccree: fix backlog notifications

by Gilad Ben-Yossef

We were doing backlog notification callbacks via a cipher/hash/aead request structure cast to the base structure, which may or may not work based on how the structure is laid in memory and is not safe. Fix it by delegating the backlog notification to the appropriate internal callbacks which are type aware. Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> Cc: stable(a)vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_aead.c | 4 ++++ drivers/crypto/ccree/cc_cipher.c | 10 +++++++--- drivers/crypto/ccree/cc_hash.c | 28 +++++++++++++++++++-------- drivers/crypto/ccree/cc_request_mgr.c | 11 ++++++++--- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c index a3527c00b29a..8c08a50a4008 100644 --- a/drivers/crypto/ccree/cc_aead.c +++ b/drivers/crypto/ccree/cc_aead.c @@ -220,6 +220,10 @@ static void cc_aead_complete(struct device *dev, void *cc_req, int err) struct crypto_aead *tfm = crypto_aead_reqtfm(cc_req); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); + /* BACKLOG notification */ + if (err == -EINPROGRESS) + goto done; + cc_unmap_aead_request(dev, areq); /* Restore ordinary iv pointer */ diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c index 15da3a35a6a1..1ba7c8a7bd52 100644 --- a/drivers/crypto/ccree/cc_cipher.c +++ b/drivers/crypto/ccree/cc_cipher.c @@ -818,9 +818,13 @@ static void cc_cipher_complete(struct device *dev, void *cc_req, int err) struct crypto_skcipher *sk_tfm = crypto_skcipher_reqtfm(req); unsigned int ivsize = crypto_skcipher_ivsize(sk_tfm); - cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst); - memcpy(req->iv, req_ctx->iv, ivsize); - kzfree(req_ctx->iv); + if (err != -EINPROGRESS) { + /* Not a BACKLOG notification */ + cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst); + memcpy(req->iv, req_ctx->iv, ivsize); + kzfree(req_ctx->iv); + } + skcipher_request_complete(req, err); } diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c index 2c4ddc8fb76b..e824ab60b59c 100644 --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c @@ -280,8 +280,12 @@ static void cc_update_complete(struct device *dev, void *cc_req, int err) dev_dbg(dev, "req=%pK\n", req); - cc_unmap_hash_request(dev, state, req->src, false); - cc_unmap_req(dev, state, ctx); + if (err != -EINPROGRESS) { + /* Not a BACKLOG notification */ + cc_unmap_hash_request(dev, state, req->src, false); + cc_unmap_req(dev, state, ctx); + } + req->base.complete(&req->base, err); } @@ -295,9 +299,13 @@ static void cc_digest_complete(struct device *dev, void *cc_req, int err) dev_dbg(dev, "req=%pK\n", req); - cc_unmap_hash_request(dev, state, req->src, false); - cc_unmap_result(dev, state, digestsize, req->result); - cc_unmap_req(dev, state, ctx); + if (err != -EINPROGRESS) { + /* Not a BACKLOG notification */ + cc_unmap_hash_request(dev, state, req->src, false); + cc_unmap_result(dev, state, digestsize, req->result); + cc_unmap_req(dev, state, ctx); + } + req->base.complete(&req->base, err); } @@ -311,9 +319,13 @@ static void cc_hash_complete(struct device *dev, void *cc_req, int err) dev_dbg(dev, "req=%pK\n", req); - cc_unmap_hash_request(dev, state, req->src, false); - cc_unmap_result(dev, state, digestsize, req->result); - cc_unmap_req(dev, state, ctx); + if (err != -EINPROGRESS) { + /* Not a BACKLOG notification */ + cc_unmap_hash_request(dev, state, req->src, false); + cc_unmap_result(dev, state, digestsize, req->result); + cc_unmap_req(dev, state, ctx); + } + req->base.complete(&req->base, err); } diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c index 88c97a580dd8..c2e8190bb067 100644 --- a/drivers/crypto/ccree/cc_request_mgr.c +++ b/drivers/crypto/ccree/cc_request_mgr.c @@ -364,10 +364,12 @@ static void cc_enqueue_backlog(struct cc_drvdata *drvdata, struct cc_bl_item *bli) { struct cc_req_mgr_handle *mgr = drvdata->request_mgr_handle; + struct device *dev = drvdata_to_dev(drvdata); spin_lock_bh(&mgr->bl_lock); list_add_tail(&bli->list, &mgr->backlog); ++mgr->bl_len; + dev_dbg(dev, "+++bl len: %d\n", mgr->bl_len); spin_unlock_bh(&mgr->bl_lock); tasklet_schedule(&mgr->comptask); } @@ -377,7 +379,7 @@ static void cc_proc_backlog(struct cc_drvdata *drvdata) struct cc_req_mgr_handle *mgr = drvdata->request_mgr_handle; struct cc_bl_item *bli; struct cc_crypto_req *creq; - struct crypto_async_request *req; + void *req; bool ivgen; unsigned int total_len; struct device *dev = drvdata_to_dev(drvdata); @@ -387,17 +389,20 @@ static void cc_proc_backlog(struct cc_drvdata *drvdata) while (mgr->bl_len) { bli = list_first_entry(&mgr->backlog, struct cc_bl_item, list); + dev_dbg(dev, "---bl len: %d\n", mgr->bl_len); + spin_unlock(&mgr->bl_lock); + creq = &bli->creq; - req = (struct crypto_async_request *)creq->user_arg; + req = creq->user_arg; /* * Notify the request we're moving out of the backlog * but only if we haven't done so already. */ if (!bli->notif) { - req->complete(req, -EINPROGRESS); + creq->user_cb(dev, req, -EINPROGRESS); bli->notif = true; } -- 2.21.0

6 years, 5 months

1
0
0 0

[PATCH] IB/hfi1: Failed to drain send queue when QP is put into error state

by Kaike Wan

commit 662d66466637862ef955f7f6e78a286d8cf0ebef upstream. When a QP is put into error state, all pending requests in the send work queue should be drained. The following sequence of events could lead to a failure, causing a request to hang: (1) The QP builds a packet and tries to send through SDMA engine. However, PIO engine is still busy. Consequently, this packet is put on the QP's tx list and the QP is put on the PIO waiting list. The field qp->s_flags is set with HFI1_S_WAIT_PIO_DRAIN; (2) The QP is put into error state by the user application and notify_error_qp() is called, which removes the QP from the PIO waiting list and the packet from the QP's tx list. In addition, qp->s_flags is cleared of RVT_S_ANY_WAIT_IO bits, which does not include HFI1_S_WAIT_PIO_DRAIN bit; (3) The hfi1_schdule_send() function is called to drain the QP's send queue. Subsequently, hfi1_do_send() is called. Since the flag bit HFI1_S_WAIT_PIO_DRAIN is set in qp->s_flags, hfi1_send_ok() fails. As a result, hfi1_do_send() bails out without draining any request from the send queue; (4) The PIO engine completes the sending and tries to wake up any QP on its waiting list. But the QP has been removed from the PIO waiting list and therefore is kept in sleep forever. The fix is to clear qp->s_flags of HFI1_S_ANY_WAIT_IO bits in step (2). HFI1_S_ANY_WAIT_IO includes RVT_S_ANY_WAIT_IO and HFI1_S_WAIT_PIO_DRAIN. Fixes: 2e2ba09e48b7 ("IB/rdmavt, IB/hfi1: Create device dependent s_flags") Cc: <stable(a)vger.kernel.org> # 4.19.x+ Reviewed-by: Mike Marciniszyn <mike.marciniszyn(a)intel.com> Reviewed-by: Alex Estrin <alex.estrin(a)intel.com> Signed-off-by: Kaike Wan <kaike.wan(a)intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro(a)intel.com> Signed-off-by: Jason Gunthorpe <jgg(a)mellanox.com> --- drivers/infiniband/hw/hfi1/qp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/qp.c b/drivers/infiniband/hw/hfi1/qp.c index 9b1e84a..63c5ba6 100644 --- a/drivers/infiniband/hw/hfi1/qp.c +++ b/drivers/infiniband/hw/hfi1/qp.c @@ -784,7 +784,7 @@ void notify_error_qp(struct rvt_qp *qp) write_seqlock(lock); if (!list_empty(&priv->s_iowait.list) && !(qp->s_flags & RVT_S_BUSY)) { - qp->s_flags &= ~RVT_S_ANY_WAIT_IO; + qp->s_flags &= ~HFI1_S_ANY_WAIT_IO; list_del_init(&priv->s_iowait.list); priv->s_iowait.lock = NULL; rvt_put_qp(qp);

6 years, 5 months

3
2
0 0

[PATCH 3/4] iwlwifi: mvm: properly check debugfs dentry before using it

by Luca Coelho

From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> debugfs can now report an error code if something went wrong instead of just NULL. So if the return value is to be used as a "real" dentry, it needs to be checked if it is an error before dereferencing it. This is now happening because of ff9fb72bc077 ("debugfs: return error values, not NULL"). If multiple iwlwifi devices are in the system, this can cause problems when the driver attempts to create the main debugfs directory again. Later on in the code we fail horribly by trying to dereference a pointer that is an error value. Reported-by: Laura Abbott <labbott(a)redhat.com> Reported-by: Gabriel Ramirez <gabriello.ramirez(a)gmail.com> Cc: Johannes Berg <johannes.berg(a)intel.com> Cc: Emmanuel Grumbach <emmanuel.grumbach(a)intel.com> Cc: Luca Coelho <luciano.coelho(a)intel.com> Cc: Intel Linux Wireless <linuxwifi(a)intel.com> Cc: Kalle Valo <kvalo(a)codeaurora.org> Cc: stable <stable(a)vger.kernel.org> # 5.0 Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Luca Coelho <luciano.coelho(a)intel.com> --- drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c index 2453ceabf00d..738eddb2e7ac 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c @@ -774,6 +774,11 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) return; mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); + if (IS_ERR_OR_NULL(mvmvif->dbgfs_dir)) { + IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n", + dbgfs_dir); + return; + } if (!mvmvif->dbgfs_dir) { IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n", -- 2.20.1

6 years, 5 months

1
0
0 0

[PATCH v2] block: bio_map_user_iov should not be limited to BIO_MAX_PAGES

by Paolo Bonzini

Because bio_kmalloc uses inline iovecs, the limit on the number of entries is not BIO_MAX_PAGES but rather UIO_MAXIOV, which indeed is already checked in bio_kmalloc. This could cause SG_IO requests to be truncated and the HBA to report a DMA overrun. Note that if the argument to iov_iter_npages were changed to UIO_MAXIOV, we would still truncate SG_IO requests beyond UIO_MAXIOV pages. Changing it to UIO_MAXIOV + 1 instead ensures that bio_kmalloc notices that the request is too big and blocks it. Cc: stable(a)vger.kernel.org Cc: Al Viro <viro(a)zeniv.linux.org.uk> Fixes: b282cc766958 ("bio_map_user_iov(): get rid of the iov_for_each()", 2017-10-11) Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- v1->v2: now with "git commit" --- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index 4db1008309ed..0914ae4adae9 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1299,7 +1299,7 @@ struct bio *bio_map_user_iov(struct request_queue *q, if (!iov_iter_count(iter)) return ERR_PTR(-EINVAL); - bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, BIO_MAX_PAGES)); + bio = bio_kmalloc(gfp_mask, iov_iter_npages(iter, UIO_MAXIOV + 1)); if (!bio) return ERR_PTR(-ENOMEM); -- 2.21.0

6 years, 5 months

2
6
0 0

[PATCH v2] drm/rockchip: shutdown drm subsystem on shutdown

by Heiko Stuebner

From: Vicente Bergas <vicencb(a)gmail.com> As explained by Robin Murphy: > the IOMMU shutdown disables paging, so if the VOP is still > scanning out then that will result in whatever IOVAs it was using now going > straight out onto the bus as physical addresses. We had a more radical approach before in commit 7f3ef5dedb14 ("drm/rockchip: Allow driver to be shutdown on reboot/kexec") but that resulted in new warnings and oopses on shutdown on rk3399 chromeos devices. So second try is resurrecting Vicentes shutdown change which should achieve the same result but in a less drastic way. Fixes: 63238173b2fa ("Revert drm/rockchip: Allow driver to be shutdown on reboot/kexec") Cc: Jeffy Chen <jeffy.chen(a)rock-chips.com> Cc: Robin Murphy <robin.murphy(a)arm.com> Cc: Marc Zyngier <marc.zyngier(a)arm.com> Cc: Brian Norris <briannorris(a)chromium.org> Cc: Doug Anderson <dianders(a)chromium.org> Cc: stable(a)vger.kernel.org Suggested-by: JeffyChen <jeffy.chen(a)rock-chips.com> Suggested-by: Robin Murphy <robin.murphy(a)arm.com> Signed-off-by: Vicente Bergas <vicencb(a)gmail.com> [adapted commit message to explain the history] Signed-off-by: Heiko Stuebner <heiko(a)sntech.de> --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 8d7a634c12c2..cb938d3cd3c2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -448,6 +448,14 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev) return 0; } +static void rockchip_drm_platform_shutdown(struct platform_device *pdev) +{ + struct drm_device *drm = platform_get_drvdata(pdev); + + if (drm) + drm_atomic_helper_shutdown(drm); +} + static const struct of_device_id rockchip_drm_dt_ids[] = { { .compatible = "rockchip,display-subsystem", }, { /* sentinel */ }, @@ -457,6 +465,7 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); static struct platform_driver rockchip_drm_platform_driver = { .probe = rockchip_drm_platform_probe, .remove = rockchip_drm_platform_remove, + .shutdown = rockchip_drm_platform_shutdown, .driver = { .name = "rockchip-drm", .of_match_table = rockchip_drm_dt_ids, -- 2.20.1

6 years, 5 months

4
4
0 0

[PATCH 4.14] atm:idt77252: Fix a kernel address leakage in idt77252

by Fuqian Huang

From: Fuqian Huang <huangfq.daxian(a)gmail.com> As there is still no hash for %p to print the address in linux 4.14, the address of function idt77252_init will be printed to syslog. Outputting kernel addresses will reveal the locations of kernel code and data. This case is similar to CVE-2018-7273[1]. Also, there is no need to print the address of function idt77252_init in idt77252_init. Just remove the print statement. [1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7273 Cc: <Stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Fuqian Huang <huangfq.daxian(a)gmail.com> --- drivers/atm/idt77252.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 47f3c4a..76e7736 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -3743,8 +3743,6 @@ static int __init idt77252_init(void) { struct sk_buff *skb; - printk("%s: at %p\n", __func__, idt77252_init); - if (sizeof(skb->cb) < sizeof(struct atm_skb_data) + sizeof(struct idt77252_skb_prv)) { printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n", -- 2.11.0

6 years, 5 months

2
1
0 0

[PATCH 5.0 000/246] 5.0.7-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.0.7 release. There are 246 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat Apr 6 08:44:36 UTC 2019. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.0.7-rc1.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.0.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.0.7-rc1 Coly Li <colyli(a)suse.de> bcache: fix potential div-zero error of writeback_rate_p_term_inverse Hans de Goede <hdegoede(a)redhat.com> ACPI / video: Extend chassis-type detection with a "Lunch Box" check Thierry Reding <treding(a)nvidia.com> gpio: of: Restrict enable-gpio quirk to regulator-gpio Arnd Bergmann <arnd(a)arndb.de> appletalk: Fix compile regression Nathan Chancellor <natechancellor(a)gmail.com> net: stmmac: Avoid one more sometimes uninitialized Clang warning Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/dp/mst: Configure no_stop_bit correctly for remote i2c xfers Chris Wilson <chris(a)chris-wilson.co.uk> drm: Reorder set_property_atomic to avoid returning with an active ww_ctx Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: simple-card-utils: check "reg" property on asoc_simple_card_get_dai_id() Hans de Goede <hdegoede(a)redhat.com> Input: soc_button_array - fix mapping of the 5th GPIO in a PNP0C40 device Jeremy Fertic <jeremyfertic(a)gmail.com> staging: iio: adt7316: fix dac_bits assignment Ben Dooks <ben.dooks(a)codethink.co.uk> dmaengine: tegra: avoid overflow of byte tracking Katsuhiro Suzuki <katsuhiro(a)katsuster.net> clk: rockchip: fix frac settings of GPLL clock for rk3328 Marek Vasut <marek.vasut(a)gmail.com> ARM: shmobile: Fix R-Car Gen2 regulator quirk Jerome Brunet <jbrunet(a)baylibre.com> clk: meson: clean-up clock registration Peter Wu <peter(a)lekensteyn.nl> drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Rafael Ávila de Espíndola <rafael(a)espindo.la> x86/build: Mark per-CPU symbols as absolute explicitly for LLD Zumeng Chen <zumeng.chen(a)gmail.com> wlcore: Fix memory leak in case wl12xx_fetch_firmware failure Hans de Goede <hdegoede(a)redhat.com> brcmfmac: Use firmware_request_nowarn for the clm_blob Ondrej Mosnacek <omosnace(a)redhat.com> selinux: do not override context on context mounts George Rimar <grimar(a)accesssoftek.com> x86/build: Specify elf_i386 linker emulation explicitly for i386 objects Daniel Vetter <daniel.vetter(a)ffwll.ch> drm/nouveau: Stop using drm_crtc_force_disable Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> drm: Auto-set allow_fb_modifiers when given modifiers at plane init Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> pinctrl: meson: meson8b: add the eth_rxd2 and eth_rxd3 pins Axel Lin <axel.lin(a)ingics.com> regulator: act8865: Fix act8600_sudcdc_voltage_ranges setting Richard Guy Briggs <rgb(a)redhat.com> audit: hand taken context to audit_kill_trees for syscall logging Mika Westerberg <mika.westerberg(a)linux.intel.com> PCI: pciehp: Assign ctrl->slot_ctrl before writing it to hardware Pawe? Chmiel <pawel.mikolaj.chmiel(a)gmail.com> media: s5p-jpeg: Check for fmt_ver_flag when doing fmt enumeration Steve Longerbeam <slongerbeam(a)gmail.com> media: rcar-vin: Allow independent VIN link enablement Florian Westphal <fw(a)strlen.de> netfilter: physdev: relax br_netfilter dependency Shunyong Yang <shunyong.yang(a)hxt-semitech.com> dmaengine: qcom_hidma: initialize tx flags in hidma_prep_dma_* Shunyong Yang <shunyong.yang(a)hxt-semitech.com> dmaengine: qcom_hidma: assign channel cookie correctly Anders Roxell <anders.roxell(a)linaro.org> dmaengine: imx-dma: fix warning comparison of distinct pointer types Valentin Schneider <valentin.schneider(a)arm.com> cpu/hotplug: Mute hotplug lockdep during init Takeshi Kihara <takeshi.kihara.df(a)renesas.com> pinctrl: sh-pfc: r8a77995: Fix MOD_SEL bit numbering Takeshi Kihara <takeshi.kihara.df(a)renesas.com> pinctrl: sh-pfc: r8a77990: Fix MOD_SEL bit numbering Xingyu Chen <xingyu.chen(a)amlogic.com> pinctrl: meson: fix G12A ao pull registers base address Buland Singh <bsingh(a)redhat.com> hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable Chao Yu <yuchao0(a)huawei.com> f2fs: fix to initialize variable to avoid UBSAN/smatch warning Sheng Yong <shengyong1(a)huawei.com> f2fs: UBSAN: set boolean value iostat_enable correctly Song Hongyan <hongyan.song(a)intel.com> HID: intel-ish: ipc: handle PIMR before ish_wakeup also clear PISR busy_clear bit Stanislav Fomichev <sdf(a)google.com> selftests/bpf: suppress readelf stderr when probing for BTF support Timo Alho <talho(a)nvidia.com> soc/tegra: fuse: Fix illegal free of IO base address David Tolnay <dtolnay(a)gmail.com> hwrng: virtio - Avoid repeated init of completion Akinobu Mita <akinobu.mita(a)gmail.com> media: mt9m111: set initial frame size other than 0x0 Tony Jones <tonyj(a)suse.de> perf script python: Add trace_context extension module to sys.modules Tony Jones <tonyj(a)suse.de> perf script python: Use PyBytes for attr in trace-event-python Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Fixup etcsnoop example Jérôme de Bretagne <jerome.debretagne(a)gmail.com> platform/x86: intel-hid: Missing power button release on some Dell models Roger Quadros <rogerq(a)ti.com> usb: dwc3: gadget: Fix OTG events when gadget driver isn't loaded Axel Lin <axel.lin(a)ingics.com> regulator: mcp16502: Include linux/gpio/consumer.h to fix build error Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: dice: add support for Solid State Logic Duende Classic/Mini Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> drm/amd/display: Enable vblank interrupt during CRC capture Nathan Fontenot <nfont(a)linux.vnet.ibm.com> powerpc/pseries: Perform full re-add of CPU for topology update post-migration Manfred Schlaegl <manfred.schlaegl(a)ginzinger.com> tty: increase the default flip buffer limit to 2*640K Chen-Yu Tsai <wens(a)csie.org> backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state Oleg Nesterov <oleg(a)redhat.com> cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting Nicolai Stange <nstange(a)suse.de> powerpc/64s: Clear on-stack exception marker upon exception return Stanislav Fomichev <sdf(a)google.com> selftests/bpf: skip verifier tests for unsupported program types Valdis Kletnieks <valdis.kletnieks(a)vt.edu> bpf: fix missing prototype warnings Paolo Valente <paolo.valente(a)linaro.org> block, bfq: fix queue removal from weights tree Paolo Valente <paolo.valente(a)linaro.org> block, bfq: fix in-service-queue check for queue merging Russell King <rmk+kernel(a)armlinux.org.uk> ARM: avoid Cortex-A9 livelock on tight dmb loops Vladimir Murzin <vladimir.murzin(a)arm.com> ARM: 8830/1: NOMMU: Toggle only bits in EXC_RETURN we are really care of Stanislaw Gruszka <sgruszka(a)redhat.com> mt7601u: bump supported EEPROM version Stephen Boyd <swboyd(a)chromium.org> drm/msm/dpu: Convert to a chained irq chip Alexey Khoroshilov <khoroshilov(a)ispras.ru> soc: qcom: gsbi: Fix error handling in gsbi_probe() Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted Mathieu Malaterre <malat(a)debian.org> ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation Shayenne Moura <shayenneluzmoura(a)gmail.com> drm/vkms: Bugfix extra vblank frame Shayenne Moura <shayenneluzmoura(a)gmail.com> drm/vkms: Bugfix racing hrtimer vblank handle Andrea Parri <andrea.parri(a)amarulasolutions.com> sched/core: Use READ_ONCE()/WRITE_ONCE() in move_queued_task()/task_rq_lock() Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/memattr: Don't bail on zero VA if it equals the region's PA Hidetoshi Seto <seto.hidetoshi(a)jp.fujitsu.com> sched/debug: Initialize sd_sysctl_cpus if !CONFIG_CPUMASK_OFFSTACK wen yang <yellowriver2010(a)hotmail.com> ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: fix RFH config command with >=10 CPUs Stefan Roese <sr(a)denx.de> staging: spi: mt7621: Add return code check on device_reset() Thierry Reding <treding(a)nvidia.com> i2c: of: Try to find an I2C adapter matching the parent Rajneesh Bhardwaj <rajneesh.bhardwaj(a)linux.intel.com> platform/x86: intel_pmc_core: Fix PCH IP sts reading Kai-Heng Feng <kai.heng.feng(a)canonical.com> e1000e: Exclude device from suspend direct complete optimization Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> e1000e: fix cyclic resets at link up with active tx Mathieu Poirier <mathieu.poirier(a)linaro.org> perf/aux: Make perf_event accessible to setup_aux() Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> drm/amd/display: Disconnect mpcc when changing tg Breno Leitao <leitao(a)debian.org> powerpc/ptrace: Mitigate potential Spectre v1 Kairui Song <kasong(a)redhat.com> x86/kexec: Fill in acpi_rsdp_addr from the first kernel Breno Leitao <leitao(a)debian.org> bpf: test_maps: fix possible out of bound access warning Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> drm/amd/display: Don't re-program planes for DPMS changes Julia Lawall <julia.lawall(a)lip6.fr> drm: rcar-du: add missing of_node_put Guenter Roeck <linux(a)roeck-us.net> cdrom: Fix race condition in cdrom_sysctl_register Manfred Schlaegl <manfred.schlaegl(a)ginzinger.com> fbdev: fbmem: fix memory access if logo is bigger than the screen Heiner Kallweit <hkallweit1(a)gmail.com> net: phy: consider latched link-down status in polling mode Raju Rangoju <rajur(a)chelsio.com> iw_cxgb4: fix srqidx leak during connection abort Russell King <rmk+kernel(a)armlinux.org.uk> net: marvell: mvpp2: fix stuck in-band SGMII negotiation Thomas Gleixner <tglx(a)linutronix.de> genirq: Avoid summation loops for /proc/stat Coly Li <colyli(a)suse.de> bcache: improve sysfs_strtoul_clamp() Coly Li <colyli(a)suse.de> bcache: fix potential div-zero error of writeback_rate_i_term_inverse Coly Li <colyli(a)suse.de> bcache: fix input overflow to sequential_cutoff Coly Li <colyli(a)suse.de> bcache: fix input overflow to cache set sysfs file io_error_halflife Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> sched/topology: Fix percpu data types in struct sd_data & struct s_data John Stultz <john.stultz(a)linaro.org> usb: f_fs: Avoid crash due to out-of-scope stack ptr access Rakesh Pillai <pillair(a)codeaurora.org> ath10k: fix shadow register implementation for WCN3990 Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ALSA: PCM: check if ops are defined before suspending PCM Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM: dts: meson8b: fix the Ethernet data line signals in eth_rgmii_pins Nathan Chancellor <natechancellor(a)gmail.com> ARM: 8833/1: Ensure that NEON code always compiles with Clang Chieh-Min Wang <chiehminw(a)synology.com> netfilter: conntrack: fix cloned unconfirmed skb->_nfct race in __nf_conntrack_confirm Masami Hiramatsu <mhiramat(a)kernel.org> kprobes: Prohibit probing on RCU debug routine Andrea Righi <righi.andrea(a)gmail.com> kprobes: Prohibit probing on bsearch() Tycho Andersen <tycho(a)tycho.ws> selftests: skip seccomp get_metadata test if not real root Shuah Khan <shuah(a)kernel.org> selftests: ir: fix warning: "%s" directive output may be truncated ’ directive output may be truncated Hans de Goede <hdegoede(a)redhat.com> ACPI / video: Refactor and fix dmi_is_desktop() Sara Sharon <sara.sharon(a)intel.com> iwlwifi: pcie: fix emergency path Arnaldo Carvalho de Melo <acme(a)redhat.com> perf coresight: Do not test for libopencsd by default Thomas Richter <tmricht(a)linux.ibm.com> perf report: Add s390 diagnosic sampling descriptor size Arnaldo Carvalho de Melo <acme(a)redhat.com> perf trace: Check if the 'fd' is negative when mapping it to pathname Arnaldo Carvalho de Melo <acme(a)redhat.com> perf beauty waitid options: Fix up prefix showing logic Arnaldo Carvalho de Melo <acme(a)redhat.com> tools build: Add test-reallocarray.c to test-all.c to fix the build Arnaldo Carvalho de Melo <acme(a)redhat.com> tools build: Add -lrt to FEATURE_CHECK_LDFLAGS-libaio Michal Kazior <michal(a)plume.com> leds: lp55xx: fix null deref on firmware load failure Theodore Ts'o <tytso(a)mit.edu> jbd2: fix race when writing superblock Niklas Cassel <niklas.cassel(a)linaro.org> regulator: core: Take lock before applying system load Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> drm/sched: Fix entities with 0 rqs. Anders Roxell <anders.roxell(a)linaro.org> efi: Fix build error due to enum collision between efi.h and ima.h Tejun Heo <tj(a)kernel.org> cgroup, rstat: Don't flush subtree root unless necessary Hong Liu <hong.liu(a)intel.com> HID: intel-ish-hid: avoid binding wrong ishtp_cl_device Aurelien Jarno <aurelien(a)aurel32.net> vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1 Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> xen/gntdev: Do not destroy context while dma-bufs are in use Marek Vasut <marek.vasut+renesas(a)gmail.com> gpio: of: Apply regulator-gpio quirk only to enable-gpios Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> mt76: usb: do not run mt76u_queues_deinit twice Ezequiel Garcia <ezequiel(a)collabora.com> media: rockchip/vpu: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: mtk-jpeg: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: mx2_emmaprp: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: s5p-g2d: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: rockchip/rga: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: s5p-jpeg: Correct return type for mem2mem buffer helpers Ezequiel Garcia <ezequiel(a)collabora.com> media: sh_veu: Correct return type for mem2mem buffer helpers Akinobu Mita <akinobu.mita(a)gmail.com> media: ov7740: fix runtime pm initialization Wen Yang <yellowriver2010(a)hotmail.com> SoC: imx-sgtl5000: add missing put_device() He Kuang <hekuang(a)huawei.com> perf report: Don't shadow inlined symbol with different addr range Brian Norris <briannorris(a)chromium.org> mwifiex: don't advertise IBSS features without FW support Thomas Richter <tmricht(a)linux.ibm.com> perf test: Fix failure of 'evsel-tp-sched' test on s390 Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> drm/amd/display: Clear stream->mode_changed after commit Sedat Dilek <sedat.dilek(a)gmail.com> scsi: fcoe: make use of fip_mode enum complete Jason Yan <yanaijie(a)huawei.com> scsi: megaraid_sas: return error when create DMA pool failed Sebastian Ott <sebott(a)linux.ibm.com> s390/ism: ignore some errors during deregistration Ross Lagerwall <ross.lagerwall(a)citrix.com> efi: cper: Fix possible out-of-bounds access Erwan Velu <erwanaliasr1(a)gmail.com> cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies Takashi Iwai <tiwai(a)suse.de> ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/44x: Force PCI on for CURRITUCK Wei Li <liwei391(a)huawei.com> perf annotate: Fix getting source line failure Katsuhiro Suzuki <katsuhiro(a)katsuster.net> clk: fractional-divider: check parent rate only if flag is set Håkon Bugge <haakon.bugge(a)oracle.com> IB/mlx4: Increase the timeout for CM cache Hans de Goede <hdegoede(a)redhat.com> i2c: designware: Do not allow i2c_dw_xfer() calls while suspended Dongli Zhang <dongli.zhang(a)oracle.com> loop: set GENHD_FL_NO_PART_SCAN after blkdev_reread_part() Vadim Pasternak <vadimp(a)mellanox.com> platform/mellanox: mlxreg-hotplug: Fix KASAN warning Yang Fan <nullptr.cpp(a)gmail.com> platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN Jim Broadus <jbroadus(a)gmail.com> i2c: Allow recovery of the initial IRQ by an I2C client device. Florian Fainelli <f.fainelli(a)gmail.com> mlxsw: spectrum: Avoid -Wformat-truncation warnings Florian Fainelli <f.fainelli(a)gmail.com> e1000e: Fix -Wformat-truncation warnings Florian Fainelli <f.fainelli(a)gmail.com> veth: Fix -Wformat-truncation Shiju Jose <shiju.jose(a)huawei.com> net: hns3: fix setting of the hns reset_type for rdma hw errors Andrew Lunn <andrew(a)lunn.ch> net: dsa: mv88e6xxx: Add lockdep classes to fix false positive splat Aaro Koskinen <aaro.koskinen(a)iki.fi> mmc: omap: fix the maximum timeout setting Josef Bacik <josef(a)toxicpanda.com> btrfs: don't enospc all tickets on flush failure Qu Wenruo <wqu(a)suse.com> btrfs: qgroup: Make qgroup async transaction commit more aggressive Andi Kleen <ak(a)linux.intel.com> perf script: Handle missing fields with -F +.. Jacob Keller <jacob.e.keller(a)intel.com> ice: fix ice_remove_rule_internal vsi_list handling Marek Behún <marek.behun(a)nic.cz> net: dsa: mv88e6xxx: Default CMODE to 1000BaseX only on 6390X Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/hugetlb: Handle mmap_min_addr correctly in get_unmapped_area callback Nicolas Boichat <drinkcat(a)chromium.org> iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables Stefan Agner <stefan(a)agner.ch> ARM: 8845/1: use unified assembler in c files Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> ARM: 8840/1: use a raw_spinlock_t in unwind Lubomir Rintel <lkundrak(a)v3.sk> serial: 8250_pxa: honor the port number from devicetree Sai Prakash Ranjan <saiprakash.ranjan(a)codeaurora.org> coresight: etm4x: Add support to enable ETMv4.2 Nathan Chancellor <natechancellor(a)gmail.com> powerpc/xmon: Fix opcode being uninitialized in print_insn_powerpc Alagu Sankar <alagusankar(a)silex-india.com> ath10k: don't report unset rssi values to mac80211 Mathias Fröhlich <Mathias.Froehlich(a)web.de> drm/amd/display: Fix reference counting for struct dc_sink. Josef Bacik <josef(a)toxicpanda.com> btrfs: save drop_progress if we drop refs at all Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: make -r/-R effective in top Makefile for old Make versions Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing Benjamin Block <bblock(a)linux.ibm.com> scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c Alexey Kardashevskiy <aik(a)ozlabs.ru> powerpc/powernv/ioda: Fix locked_vm counting for memory used by IOMMU tables Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> usb: chipidea: Grab the (legacy) USB PHY by phandle first Yonghong Song <yhs(a)fb.com> tools/bpf: selftests: add map lookup to test_map_in_map bpf prog Eric Biggers <ebiggers(a)google.com> crypto: cavium/zip - fix collision with generic cra_driver_name Julia Lawall <Julia.Lawall(a)lip6.fr> crypto: crypto4xx - add missing of_node_put after of_device_is_available Bart Van Assche <bvanassche(a)acm.org> lockdep/lib/tests: Fix run_tests.sh Surabhi Vishnoi <svishnoi(a)codeaurora.org> ath10k: Fix the wrong updation of BW in tx_stats debugfs entry Wen Yang <wen.yang99(a)zte.com.cn> mt76: fix a leaked reference by adding a missing of_node_put Alexei Avshalom Lazar <ailizaro(a)codeaurora.org> wil6210: check null pointer in _wil_cfg80211_merge_extra_ies Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PCI/PME: Fix hotplug/sysfs remove deadlock in pcie_pme_remove() Dave Hansen <dave.hansen(a)linux.intel.com> mm/resource: Return real error codes from walk failures Tony Jones <tonyj(a)suse.de> tools lib traceevent: Fix buffer overflow in arg_eval Carlos Maiolino <cmaiolino(a)redhat.com> fs: fix guard_bio_eod to check for real EOD errors Eric Whitney <enwlinux(a)gmail.com> ext4: fix bigalloc cluster freeing when hole punching under load luojiajun <luojiajun3(a)huawei.com> jbd2: fix invalid descriptor block checksum Lu Baolu <baolu.lu(a)linux.intel.com> iommu/vt-d: Disable ATS support on untrusted devices Florian Westphal <fw(a)strlen.de> netfilter: conntrack: tcp: only close if RST matches exact sequence Honghui Zhang <honghui.zhang(a)mediatek.com> PCI: mediatek: Fix memory mapped IO range size computation Li RongQing <lirongqing(a)baidu.com> netfilter: nf_tables: check the result of dereferencing base_chain->stats Arnaldo Carvalho de Melo <acme(a)redhat.com> perf beauty msg_flags: Add missing %s lost when adding prefix suppression logic Slavomir Kaslev <kaslevs(a)vmware.com> fs: Make splice() and tee() take into account O_NONBLOCK flag on pipes Yao Liu <yotta.liu(a)ucloud.cn> cifs: Fix NULL pointer dereference of devname Namjae Jeon <linkinjeon(a)gmail.com> cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED Chao Yu <yuchao0(a)huawei.com> f2fs: fix to check inline_xattr_size boundary correctly Jason Cai (Xiang Feng) <jason.cai.kern(a)gmail.com> dm thin: add sanity checks to thin-pool and external snapshot creation Louis Taylor <louis(a)kragniz.eu> cifs: use correct format characters Arnd Bergmann <arnd(a)arndb.de> kasan: fix kasan_check_read/write definitions Qian Cai <cai(a)lca.pw> page_poison: play nicely with KASAN Shuriyc Chu <sureeju(a)gmail.com> fs/file.c: initialize init_files.resize_wait zhengliang <zhengliang6(a)huawei.com> f2fs: fix to data block override node segment by mistake Sahitya Tummala <stummala(a)codeaurora.org> f2fs: do not use mutex lock in atomic context Jia Guo <guojia12(a)huawei.com> ocfs2: fix a panic problem caused by o2cb_ctl Qian Cai <cai(a)lca.pw> mm/slab.c: kmemleak no scan alien caches Uladzislau Rezki (Sony) <urezki(a)gmail.com> mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512! Vlastimil Babka <vbabka(a)suse.cz> mm, mempolicy: fix uninit memory access Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> memcg: killed threads should not invoke memcg OOM killer Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mm,oom: don't kill global init via memory.oom.group Mike Rapoport <rppt(a)linux.ibm.com> docs/core-api/mm: fix user memory accessors formatting Daniel Jordan <daniel.m.jordan(a)oracle.com> mm, swap: bounds check swap_info array accesses to avoid NULL derefs Qian Cai <cai(a)lca.pw> mm/page_ext.c: fix an imbalance with kmemleak Peng Fan <peng.fan(a)nxp.com> mm/cma.c: cma_declare_contiguous: correct err handling Qian Cai <cai(a)lca.pw> mm/sparse: fix a bad comparison Jiri Olsa <jolsa(a)redhat.com> perf c2c: Fix c2c report for empty numa node Kairui Song <kasong(a)redhat.com> x86/hyperv: Fix kernel panic when kexec on HyperV Linus Torvalds <torvalds(a)linux-foundation.org> iio: adc: fix warning in Qualcomm PM8xxx HK/XOADC driver Xiang Chen <chenxiang66(a)hisilicon.com> scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO John Garry <john.garry(a)huawei.com> scsi: hisi_sas: Set PHY linkrate when disconnected Stanislav Fomichev <sdf(a)google.com> libbpf: force fixdep compilation at the start of the build Arnd Bergmann <arnd(a)arndb.de> enic: fix build warning without CONFIG_CPUMASK_OFFSTACK Nathan Chancellor <natechancellor(a)gmail.com> net: stmmac: Avoid sometimes uninitialized Clang warnings Christian Brauner <christian(a)brauner.io> sysctl: handle overflow for file-max Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> include/linux/relay.h: fix percpu annotation in struct rchan Russell King <rmk+kernel(a)armlinux.org.uk> gpio: gpio-omap: fix level interrupt idling Tony Lindgren <tony(a)atomide.com> clk: ti: clkctrl: Fix clkdm_name regression for TI_CLK_CLKCTRL_COMPAT Björn Töpel <bjorn.topel(a)intel.com> xsk: fix to reject invalid flags in xsk_bind Tonghao Zhang <xiangxia.m.yue(a)gmail.com> net/mlx5: Avoid panic when setting vport mac, getting vport config Tonghao Zhang <xiangxia.m.yue(a)gmail.com> net/mlx5: Avoid panic when setting vport rate Tariq Toukan <tariqt(a)mellanox.com> net/mlx5e: Fix access to non-existing receive queue Douglas Anderson <dianders(a)chromium.org> tracing: kdb: Fix ftdump to not sleep John Johansen <john.johansen(a)canonical.com> apparmor: fix double free when unpack of secmark rules fails Chao Yu <yuchao0(a)huawei.com> f2fs: fix to avoid deadlock in f2fs_read_inline_dir() Chao Yu <yuchao0(a)huawei.com> f2fs: fix to adapt small inline xattr space in __find_inline_xattr() Masahiro Yamada <yamada.masahiro(a)socionext.com> h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux- Yufen Yu <yuyufen(a)huawei.com> nvme-loop: init nvmet_ctrl fatal_err_work when allocate James Smart <jsmart2021(a)gmail.com> nvme-fc: fix numa_node when dev is null Aurelien Aptel <aaptel(a)suse.com> CIFS: fix POSIX lock leak and invalid ptr deref zhangyi (F) <yi.zhang(a)huawei.com> ext4: cleanup bh release code in ext4_ind_remove_space() ------------- Diffstat: Documentation/arm/kernel_mode_neon.txt | 4 +- Makefile | 59 ++++++++++-------- arch/arm/boot/dts/lpc32xx.dtsi | 18 +++--- arch/arm/boot/dts/meson8b.dtsi | 6 +- arch/arm/include/asm/barrier.h | 2 + arch/arm/include/asm/processor.h | 6 +- arch/arm/include/asm/v7m.h | 2 +- arch/arm/kernel/entry-header.S | 3 +- arch/arm/kernel/entry-v7m.S | 4 ++ arch/arm/kernel/machine_kexec.c | 5 +- arch/arm/kernel/smp.c | 4 +- arch/arm/kernel/unwind.c | 14 ++--- arch/arm/lib/Makefile | 2 +- arch/arm/lib/xor-neon.c | 2 +- arch/arm/mach-omap2/prm_common.c | 4 +- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 ++ arch/arm/mm/copypage-v4mc.c | 3 +- arch/arm/mm/copypage-v4wb.c | 3 +- arch/arm/mm/copypage-v4wt.c | 3 +- arch/arm/mm/proc-v7m.S | 3 + arch/h8300/Makefile | 2 +- arch/powerpc/include/asm/topology.h | 2 + arch/powerpc/kernel/entry_64.S | 7 +++ arch/powerpc/kernel/ptrace.c | 8 ++- arch/powerpc/mm/hugetlbpage-radix.c | 5 +- arch/powerpc/mm/numa.c | 9 +-- arch/powerpc/platforms/44x/Kconfig | 1 + arch/powerpc/platforms/powernv/pci-ioda-tce.c | 1 - arch/powerpc/platforms/powernv/pci-ioda.c | 7 ++- arch/powerpc/platforms/pseries/hotplug-cpu.c | 19 ++++++ arch/powerpc/xmon/ppc-dis.c | 2 +- arch/s390/kernel/perf_cpum_sf.c | 6 +- arch/x86/boot/Makefile | 2 +- arch/x86/events/intel/bts.c | 4 +- arch/x86/events/intel/pt.c | 5 +- arch/x86/hyperv/hv_init.c | 7 +++ arch/x86/include/asm/uaccess.h | 24 ++++---- arch/x86/kernel/kexec-bzimage64.c | 4 +- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/lib/usercopy_32.c | 8 +-- arch/x86/platform/efi/quirks.c | 4 +- arch/x86/realmode/rm/Makefile | 2 +- block/bfq-iosched.c | 22 +++++-- block/bfq-iosched.h | 3 + block/bfq-wf2q.c | 6 +- drivers/acpi/acpi_video.c | 20 ++++-- drivers/block/loop.c | 21 +++++-- drivers/cdrom/cdrom.c | 7 +-- drivers/char/hpet.c | 2 +- drivers/char/hw_random/virtio-rng.c | 2 +- drivers/clk/clk-fractional-divider.c | 2 +- drivers/clk/meson/meson-aoclk.c | 15 +++-- drivers/clk/rockchip/clk-rk3328.c | 12 ++-- drivers/clk/ti/clkctrl.c | 2 +- drivers/cpufreq/acpi-cpufreq.c | 4 +- drivers/crypto/amcc/crypto4xx_trng.c | 4 +- drivers/crypto/cavium/zip/zip_main.c | 6 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/qcom/hidma.c | 19 +++--- drivers/dma/tegra20-apb-dma.c | 5 +- drivers/firmware/efi/cper.c | 13 ++-- drivers/firmware/efi/libstub/arm-stub.c | 5 ++ drivers/firmware/efi/libstub/efi-stub-helper.c | 10 +++ drivers/firmware/efi/libstub/efistub.h | 1 + drivers/firmware/efi/libstub/fdt.c | 3 + drivers/firmware/efi/memattr.c | 2 +- drivers/firmware/efi/runtime-wrappers.c | 48 +++++++-------- drivers/gpio/gpio-omap.c | 14 +++-- drivers/gpio/gpiolib-of.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 60 +++++++++++++++--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 42 ++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + drivers/gpu/drm/amd/display/dc/core/dc.c | 3 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 ++- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_mode_object.c | 1 + drivers/gpu/drm/drm_plane.c | 3 + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 36 ++++++----- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 + drivers/gpu/drm/scheduler/sched_entity.c | 39 ++++++++---- drivers/gpu/drm/vkms/vkms_crtc.c | 21 +++---- drivers/hid/intel-ish-hid/ipc/ipc.c | 9 ++- drivers/hid/intel-ish-hid/ishtp/bus.c | 4 +- drivers/hwtracing/coresight/coresight-etm-perf.c | 6 +- drivers/hwtracing/coresight/coresight-etm4x.c | 3 +- drivers/i2c/busses/i2c-designware-core.h | 2 + drivers/i2c/busses/i2c-designware-master.c | 6 ++ drivers/i2c/busses/i2c-designware-pcidrv.c | 7 ++- drivers/i2c/busses/i2c-designware-platdrv.c | 3 + drivers/i2c/i2c-core-base.c | 9 +-- drivers/i2c/i2c-core-of.c | 14 ++++- drivers/iio/adc/qcom-pm8xxx-xoadc.c | 10 +-- drivers/infiniband/hw/cxgb4/cm.c | 5 +- drivers/infiniband/hw/mlx4/cm.c | 2 +- drivers/input/misc/soc_button_array.c | 2 +- drivers/iommu/intel-iommu.c | 3 +- drivers/iommu/io-pgtable-arm-v7s.c | 3 +- drivers/leds/leds-lp55xx-common.c | 4 +- drivers/md/bcache/sysfs.c | 25 ++++++-- drivers/md/bcache/sysfs.h | 13 +++- drivers/md/dm-thin.c | 13 ++++ drivers/media/i2c/mt9m111.c | 2 + drivers/media/i2c/ov7740.c | 7 ++- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 40 ++++++------ drivers/media/platform/mx2_emmaprp.c | 6 +- drivers/media/platform/rcar-vin/rcar-core.c | 8 ++- drivers/media/platform/rockchip/rga/rga.c | 6 +- drivers/media/platform/s5p-g2d/g2d.c | 6 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 57 +++++++++-------- drivers/media/platform/sh_veu.c | 4 +- drivers/mmc/host/omap.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 8 +++ drivers/net/dsa/mv88e6xxx/port.c | 2 + drivers/net/ethernet/cisco/enic/enic_main.c | 6 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 36 ++++++----- drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++---- drivers/net/ethernet/intel/ice/ice_switch.c | 15 ++++- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 17 ++++-- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 17 ++++-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- drivers/net/phy/phy-c45.c | 10 ++- drivers/net/phy/phy_device.c | 13 ++-- drivers/net/veth.c | 3 +- drivers/net/wireless/ath/ath10k/ce.c | 26 ++++---- drivers/net/wireless/ath/ath10k/ce.h | 2 +- drivers/net/wireless/ath/ath10k/debugfs_sta.c | 7 ++- drivers/net/wireless/ath/ath10k/htt_rx.c | 12 +++- drivers/net/wireless/ath/ath10k/wmi.h | 2 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 14 ++++- .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 20 ++++-- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 11 +++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 ++- drivers/net/wireless/mediatek/mt76/eeprom.c | 24 +++++--- drivers/net/wireless/mediatek/mt76/usb.c | 11 +--- drivers/net/wireless/mediatek/mt7601u/eeprom.h | 2 +- drivers/net/wireless/ti/wlcore/main.c | 7 ++- drivers/nvme/host/fc.c | 5 +- drivers/nvme/target/core.c | 20 +++--- drivers/pci/controller/pcie-mediatek.c | 5 +- drivers/pci/hotplug/pciehp_hpc.c | 2 +- drivers/pci/pcie/pme.c | 22 ++++--- drivers/perf/arm_spe_pmu.c | 6 +- drivers/pinctrl/meson/pinctrl-meson.c | 22 ++++--- drivers/pinctrl/meson/pinctrl-meson8b.c | 6 +- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 32 +++++----- drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 11 ++-- drivers/platform/mellanox/mlxreg-hotplug.c | 5 +- drivers/platform/x86/ideapad-laptop.c | 2 +- drivers/platform/x86/intel-hid.c | 7 ++- drivers/platform/x86/intel_pmc_core.c | 3 +- drivers/platform/x86/intel_pmc_core.h | 2 +- drivers/regulator/act8865-regulator.c | 5 +- drivers/regulator/core.c | 2 + drivers/regulator/mcp16502.c | 1 + drivers/s390/net/ism_drv.c | 12 +++- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- drivers/scsi/fcoe/fcoe.c | 2 +- drivers/scsi/fcoe/fcoe_ctlr.c | 7 ++- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 13 +++- drivers/scsi/megaraid/megaraid_sas_base.c | 1 + drivers/scsi/qedf/qedf_main.c | 2 +- drivers/scsi/scsi_scan.c | 6 +- drivers/soc/qcom/qcom_gsbi.c | 7 ++- drivers/soc/tegra/fuse/fuse-tegra.c | 12 +++- drivers/staging/iio/addac/adt7316.c | 18 +++--- .../media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +- .../media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +- drivers/staging/mt7621-spi/spi-mt7621.c | 7 ++- drivers/tty/serial/8250/8250_pxa.c | 4 ++ drivers/tty/tty_buffer.c | 2 +- drivers/usb/chipidea/core.c | 9 ++- drivers/usb/dwc3/gadget.c | 2 + drivers/usb/gadget/function/f_fs.c | 1 + drivers/video/backlight/pwm_bl.c | 2 +- drivers/video/fbdev/core/fbmem.c | 3 + drivers/xen/gntdev-dmabuf.c | 12 +++- drivers/xen/gntdev-dmabuf.h | 2 +- drivers/xen/gntdev.c | 2 +- fs/btrfs/extent-tree.c | 71 ++++++++++++++-------- fs/btrfs/qgroup.c | 28 ++++----- fs/buffer.c | 7 +++ fs/cifs/cifs_dfs_ref.c | 4 +- fs/cifs/connect.c | 5 ++ fs/cifs/file.c | 14 ++++- fs/cifs/smb1ops.c | 2 +- fs/cifs/smb2pdu.c | 10 ++- fs/ext4/extents.c | 17 +++--- fs/ext4/indirect.c | 47 +++++++------- fs/f2fs/extent_cache.c | 2 +- fs/f2fs/f2fs.h | 1 - fs/f2fs/inline.c | 8 ++- fs/f2fs/super.c | 17 ++++-- fs/f2fs/sysfs.c | 12 +++- fs/f2fs/trace.c | 20 +++--- fs/f2fs/xattr.c | 13 +++- fs/file.c | 1 + fs/jbd2/commit.c | 6 +- fs/jbd2/journal.c | 52 ++++++++-------- fs/ocfs2/cluster/nodemanager.c | 14 +++-- fs/read_write.c | 6 ++ fs/splice.c | 12 ++++ include/linux/atalk.h | 18 ++++-- include/linux/cgroup-defs.h | 2 +- include/linux/cgroup.h | 2 + include/linux/clk-provider.h | 3 + include/linux/efi.h | 26 ++++---- include/linux/f2fs_fs.h | 13 ++-- include/linux/filter.h | 4 +- include/linux/i2c.h | 1 + include/linux/irqdesc.h | 1 + include/linux/kasan-checks.h | 2 +- include/linux/perf_event.h | 2 +- include/linux/relay.h | 2 +- include/linux/ring_buffer.h | 2 +- include/linux/sched.h | 4 +- include/linux/sched/topology.h | 8 +-- include/net/netfilter/br_netfilter.h | 1 - include/scsi/libfcoe.h | 4 +- kernel/audit.h | 4 +- kernel/audit_tree.c | 19 +++--- kernel/auditsc.c | 12 ++-- kernel/cgroup/cgroup.c | 15 +++-- kernel/cgroup/pids.c | 4 +- kernel/cgroup/rstat.c | 10 +-- kernel/cpu.c | 9 +++ kernel/events/ring_buffer.c | 2 +- kernel/exit.c | 1 + kernel/irq/chip.c | 12 +++- kernel/irq/internals.h | 8 ++- kernel/irq/irqdesc.c | 7 ++- kernel/rcu/update.c | 2 + kernel/resource.c | 4 +- kernel/sched/core.c | 9 +-- kernel/sched/debug.c | 4 ++ kernel/sched/sched.h | 6 +- kernel/sched/topology.c | 2 +- kernel/sysctl.c | 3 + kernel/trace/ring_buffer.c | 5 +- kernel/trace/trace.c | 6 +- kernel/trace/trace_kdb.c | 6 +- lib/bsearch.c | 2 + lib/raid6/Makefile | 2 +- mm/cma.c | 4 +- mm/kasan/common.c | 2 + mm/memcontrol.c | 19 ++++-- mm/mempolicy.c | 2 +- mm/oom_kill.c | 3 +- mm/page_alloc.c | 2 +- mm/page_ext.c | 1 + mm/page_poison.c | 4 ++ mm/slab.c | 17 +++--- mm/sparse.c | 2 +- mm/swapfile.c | 51 +++++++++------- mm/vmalloc.c | 6 +- net/bridge/br_netfilter_hooks.c | 5 -- net/netfilter/nf_conntrack_core.c | 14 ++++- net/netfilter/nf_conntrack_proto_tcp.c | 50 ++++++++++++--- net/netfilter/nf_tables_core.c | 14 +++-- net/netfilter/xt_physdev.c | 9 ++- net/xdp/xsk.c | 5 +- security/apparmor/policy_unpack.c | 1 + security/selinux/hooks.c | 9 ++- sound/core/pcm_native.c | 8 +++ sound/firewire/dice/dice.c | 12 +++- sound/soc/fsl/fsl-asoc-card.c | 1 + sound/soc/fsl/imx-sgtl5000.c | 1 + sound/soc/generic/simple-card-utils.c | 14 ++++- sound/soc/qcom/common.c | 10 ++- tools/build/Makefile.feature | 2 +- tools/build/feature/test-all.c | 10 +-- tools/build/feature/test-reallocarray.c | 2 + tools/lib/bpf/Makefile | 3 +- tools/lib/lockdep/run_tests.sh | 6 +- tools/lib/traceevent/event-parse.c | 2 +- tools/perf/Makefile.config | 5 +- tools/perf/Makefile.perf | 2 +- tools/perf/builtin-c2c.c | 8 ++- tools/perf/builtin-script.c | 10 ++- tools/perf/builtin-trace.c | 6 +- tools/perf/tests/evsel-tp-sched.c | 6 +- tools/perf/trace/beauty/msg_flags.c | 2 +- tools/perf/trace/beauty/waitid_options.c | 2 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/s390-cpumsf.c | 5 ++ .../util/scripting-engines/trace-event-python.c | 15 +++-- tools/perf/util/sort.c | 10 ++- tools/perf/util/srcline.c | 2 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_map_in_map.c | 4 ++ tools/testing/selftests/bpf/test_maps.c | 27 ++++---- tools/testing/selftests/bpf/test_verifier.c | 9 ++- tools/testing/selftests/ir/ir_loopback.c | 4 +- tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++ 301 files changed, 1765 insertions(+), 927 deletions(-)

6 years, 5 months

11
263
0 0

[PATCH] ceph: Fix a memory leak in ci->i_head_snapc

by Luis Henriques

I'm occasionally seeing a kmemleak warning in xfstest generic/013: unreferenced object 0xffff8881fccca940 (size 32): comm "kworker/0:1", pid 12, jiffies 4295005883 (age 130.648s) hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000d741a1ea>] build_snap_context+0x5b/0x2a0 [<0000000021a00533>] rebuild_snap_realms+0x27/0x90 [<00000000ac538600>] rebuild_snap_realms+0x42/0x90 [<000000000e955fac>] ceph_update_snap_trace+0x2ee/0x610 [<00000000a9550416>] ceph_handle_snap+0x317/0x5f3 [<00000000fc287b83>] dispatch+0x362/0x176c [<00000000a312c741>] ceph_con_workfn+0x9ce/0x2cf0 [<000000004168e3a9>] process_one_work+0x1d4/0x400 [<000000002188e9e7>] worker_thread+0x2d/0x3c0 [<00000000b593e4b3>] kthread+0x112/0x130 [<00000000a8587dca>] ret_from_fork+0x35/0x40 [<00000000ba1c9c1d>] 0xffffffffffffffff It looks like it is possible that we miss a flush_ack from the MDS when, for example, umounting the filesystem. In that case, we can simply drop the reference to the ceph_snap_context obtained in ceph_queue_cap_snap(). Link: https://tracker.ceph.com/issues/38224 Cc: stable(a)vger.kernel.org Signed-off-by: Luis Henriques <lhenriques(a)suse.com> --- fs/ceph/caps.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 36a8dc699448..208f4dc6f574 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1054,6 +1054,7 @@ int ceph_is_any_caps(struct inode *inode) static void drop_inode_snap_realm(struct ceph_inode_info *ci) { struct ceph_snap_realm *realm = ci->i_snap_realm; + spin_lock(&realm->inodes_with_caps_lock); list_del_init(&ci->i_snap_realm_item); ci->i_snap_realm_counter++; @@ -1063,6 +1064,12 @@ static void drop_inode_snap_realm(struct ceph_inode_info *ci) spin_unlock(&realm->inodes_with_caps_lock); ceph_put_snap_realm(ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc, realm); + /* + * ci->i_head_snapc should be NULL, but we may still be waiting for a + * flush_ack from the MDS. In that case, we still hold a ref for the + * ceph_snap_context and we need to drop it. + */ + ceph_put_snap_context(ci->i_head_snapc); } /*

6 years, 5 months

2
11
0 0

+ zram-pass-down-the-bvec-we-need-to-read-into-in-the-work-struct.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: zram: pass down the bvec we need to read into in the work struct has been added to the -mm tree. Its filename is zram-pass-down-the-bvec-we-need-to-read-into-in-the-work-struct.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/zram-pass-down-the-bvec-we-need-to… and later at http://ozlabs.org/~akpm/mmotm/broken-out/zram-pass-down-the-bvec-we-need-to… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jérôme Glisse <jglisse(a)redhat.com> Subject: zram: pass down the bvec we need to read into in the work struct When scheduling work item to read page we need to pass down the proper bvec struct which points to the page to read into. Before this patch it uses a randomly initialized bvec (only if PAGE_SIZE != 4096) which is wrong. Note that without this patch on arch/kernel where PAGE_SIZE != 4096 userspace could read random memory through a zram block device (thought userspace probably would have no control on the address being read). Link: http://lkml.kernel.org/r/20190408183219.26377-1-jglisse@redhat.com Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Reviewed-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Minchan Kim <minchan(a)kernel.org> Cc: Nitin Gupta <ngupta(a)vflare.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/block/zram/zram_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/block/zram/zram_drv.c~zram-pass-down-the-bvec-we-need-to-read-into-in-the-work-struct +++ a/drivers/block/zram/zram_drv.c @@ -774,18 +774,18 @@ struct zram_work { struct zram *zram; unsigned long entry; struct bio *bio; + struct bio_vec bvec; }; #if PAGE_SIZE != 4096 static void zram_sync_read(struct work_struct *work) { - struct bio_vec bvec; struct zram_work *zw = container_of(work, struct zram_work, work); struct zram *zram = zw->zram; unsigned long entry = zw->entry; struct bio *bio = zw->bio; - read_from_bdev_async(zram, &bvec, entry, bio); + read_from_bdev_async(zram, &zw->bvec, entry, bio); } /* @@ -798,6 +798,7 @@ static int read_from_bdev_sync(struct zr { struct zram_work work; + work.bvec = *bvec; work.zram = zram; work.entry = entry; work.bio = bio; _ Patches currently in -mm which might be from jglisse(a)redhat.com are zram-pass-down-the-bvec-we-need-to-read-into-in-the-work-struct.patch mm-hmm-select-mmu-notifier-when-selecting-hmm-v2.patch mm-hmm-use-reference-counting-for-hmm-struct-v3.patch mm-hmm-do-not-erase-snapshot-when-a-range-is-invalidated.patch mm-hmm-improve-and-rename-hmm_vma_get_pfns-to-hmm_range_snapshot-v2.patch mm-hmm-improve-and-rename-hmm_vma_fault-to-hmm_range_fault-v3.patch mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-v3.patch mm-hmm-add-default-fault-flags-to-avoid-the-need-to-pre-fill-pfns-arrays-v2.patch mm-hmm-mirror-hugetlbfs-snapshoting-faulting-and-dma-mapping-v3.patch mm-hmm-allow-to-mirror-vma-of-a-file-on-a-dax-backed-filesystem-v3.patch mm-hmm-add-helpers-to-test-if-mm-is-still-alive-or-not.patch mm-hmm-add-an-helper-function-that-fault-pages-and-map-them-to-a-device-v3.patch mm-hmm-add-an-helper-function-that-fault-pages-and-map-them-to-a-device-v3-fix.patch mm-hmm-convert-various-hmm_pfn_-to-device_entry-which-is-a-better-name.patch mm-mmu_notifier-helper-to-test-if-a-range-invalidation-is-blockable.patch mm-mmu_notifier-convert-user-range-blockable-to-helper-function.patch mm-mmu_notifier-convert-mmu_notifier_range-blockable-to-a-flags.patch mm-mmu_notifier-contextual-information-for-event-enums.patch mm-mmu_notifier-contextual-information-for-event-triggering-invalidation-v2.patch mm-mmu_notifier-use-correct-mmu_notifier-events-for-each-invalidation.patch mm-mmu_notifier-pass-down-vma-and-reasons-why-mmu-notifier-is-happening-v2.patch mm-mmu_notifier-mmu_notifier_range_update_to_read_only-helper.patch

6 years, 5 months

2
1
0 0

+ libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields has been added to the -mm tree. Its filename is libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/libnvdimm-pfn-fix-fsdax-mode-names… and later at http://ozlabs.org/~akpm/mmotm/broken-out/libnvdimm-pfn-fix-fsdax-mode-names… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dan Williams <dan.j.williams(a)intel.com> Subject: libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields At namespace creation time there is the potential for the "expected to be zero" fields of a 'pfn' info-block to be filled with indeterminate data. While the kernel buffer is zeroed on allocation it is immediately overwritten by nd_pfn_validate() filling it with the current contents of the on-media info-block location. For fields like, 'flags' and the 'padding' it potentially means that future implementations can not rely on those fields being zero. In preparation to stop using the 'start_pad' and 'end_trunc' fields for section alignment, arrange for fields that are not explicitly initialized to be guaranteed zero. Bump the minor version to indicate it is safe to assume the 'padding' and 'flags' are zero. Otherwise, this corruption is expected to benign since all other critical fields are explicitly initialized. Link: http://lkml.kernel.org/r/155552639290.2015392.17304211251966796338.stgit@dw… Fixes: 32ab0a3f5170 ("libnvdimm, pmem: 'struct page' for pmem") Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Cc: <stable(a)vger.kernel.org> Cc: David Hildenbrand <david(a)redhat.com> Cc: Jeff Moyer <jmoyer(a)redhat.com> Cc: Jérôme Glisse <jglisse(a)redhat.com> Cc: Logan Gunthorpe <logang(a)deltatee.com> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Toshi Kani <toshi.kani(a)hpe.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/nvdimm/dax_devs.c | 2 +- drivers/nvdimm/pfn.h | 1 + drivers/nvdimm/pfn_devs.c | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) --- a/drivers/nvdimm/dax_devs.c~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/dax_devs.c @@ -126,7 +126,7 @@ int nd_dax_probe(struct device *dev, str nvdimm_bus_unlock(&ndns->dev); if (!dax_dev) return -ENOMEM; - pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); nd_pfn->pfn_sb = pfn_sb; rc = nd_pfn_validate(nd_pfn, DAX_SIG); dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>"); --- a/drivers/nvdimm/pfn_devs.c~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/pfn_devs.c @@ -420,6 +420,15 @@ static int nd_pfn_clear_memmap_errors(st return 0; } +/** + * nd_pfn_validate - read and validate info-block + * @nd_pfn: fsdax namespace runtime state / properties + * @sig: 'devdax' or 'fsdax' signature + * + * Upon return the info-block buffer contents (->pfn_sb) are + * indeterminate when validation fails, and a coherent info-block + * otherwise. + */ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) { u64 checksum, offset; @@ -565,7 +574,7 @@ int nd_pfn_probe(struct device *dev, str nvdimm_bus_unlock(&ndns->dev); if (!pfn_dev) return -ENOMEM; - pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); nd_pfn = to_nd_pfn(pfn_dev); nd_pfn->pfn_sb = pfn_sb; rc = nd_pfn_validate(nd_pfn, PFN_SIG); @@ -702,7 +711,7 @@ static int nd_pfn_init(struct nd_pfn *nd u64 checksum; int rc; - pfn_sb = devm_kzalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL); + pfn_sb = devm_kmalloc(&nd_pfn->dev, sizeof(*pfn_sb), GFP_KERNEL); if (!pfn_sb) return -ENOMEM; @@ -711,11 +720,14 @@ static int nd_pfn_init(struct nd_pfn *nd sig = DAX_SIG; else sig = PFN_SIG; + rc = nd_pfn_validate(nd_pfn, sig); if (rc != -ENODEV) return rc; /* no info block, do init */; + memset(pfn_sb, 0, sizeof(*pfn_sb)); + nd_region = to_nd_region(nd_pfn->dev.parent); if (nd_region->ro) { dev_info(&nd_pfn->dev, @@ -768,7 +780,7 @@ static int nd_pfn_init(struct nd_pfn *nd memcpy(pfn_sb->uuid, nd_pfn->uuid, 16); memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16); pfn_sb->version_major = cpu_to_le16(1); - pfn_sb->version_minor = cpu_to_le16(2); + pfn_sb->version_minor = cpu_to_le16(3); pfn_sb->start_pad = cpu_to_le32(start_pad); pfn_sb->end_trunc = cpu_to_le32(end_trunc); pfn_sb->align = cpu_to_le32(nd_pfn->align); --- a/drivers/nvdimm/pfn.h~libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields +++ a/drivers/nvdimm/pfn.h @@ -36,6 +36,7 @@ struct nd_pfn_sb { __le32 end_trunc; /* minor-version-2 record the base alignment of the mapping */ __le32 align; + /* minor-version-3 guarantee the padding and flags are zero */ u8 padding[4000]; __le64 checksum; }; _ Patches currently in -mm which might be from dan.j.williams(a)intel.com are init-initialize-jump-labels-before-command-line-option-parsing.patch mm-sparsemem-introduce-struct-mem_section_usage.patch mm-sparsemem-introduce-common-definitions-for-the-size-and-mask-of-a-section.patch mm-sparsemem-add-helpers-track-active-portions-of-a-section-at-boot.patch mm-hotplug-prepare-shrink_zone-pgdat_span-for-sub-section-removal.patch mm-sparsemem-convert-kmalloc_section_memmap-to-populate_section_memmap.patch mm-hotplug-add-mem-hotplug-restrictions-for-remove_memory.patch mm-kill-is_dev_zone-helper.patch mm-sparsemem-prepare-for-sub-section-ranges.patch mm-sparsemem-support-sub-section-hotplug.patch mm-devm_memremap_pages-enable-sub-section-remap.patch libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch libnvdimm-pfn-stop-padding-pmem-namespaces-to-section-alignment.patch mm-shuffle-initial-free-memory-to-improve-memory-side-cache-utilization.patch mm-shuffle-initial-free-memory-to-improve-memory-side-cache-utilization-fix.patch mm-move-buddy-list-manipulations-into-helpers.patch mm-move-buddy-list-manipulations-into-helpers-fix.patch mm-maintain-randomization-of-page-free-lists.patch

6 years, 5 months

1
0
0 0

[PATCH v3 11/26] ceph: fix compat_ioctl for ceph_dir_operations

by Arnd Bergmann

The ceph_ioctl function is used both for files and directories, but only the files support doing that in 32-bit compat mode. For consistency, add the same compat handler to the dir operations as well. Reviewed-by: "Yan, Zheng" <zyan(a)redhat.com> Cc: stable(a)vger.kernel.org Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/ceph/dir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index a8f429882249..7c060cb22aa3 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1785,6 +1785,7 @@ const struct file_operations ceph_dir_fops = { .open = ceph_open, .release = ceph_release, .unlocked_ioctl = ceph_ioctl, + .compat_ioctl = ceph_ioctl, .fsync = ceph_fsync, .lock = ceph_lock, .flock = ceph_flock, -- 2.20.0

6 years, 5 months

2
2
0 0

[PATCH stable 4.14] net: stmmac: Set dma ring length before enabling the DMA

by Lars Persson

This was fixed in upstream by commit 7d9e6c5afab6 ("net: stmmac: Integrate XGMAC into main driver flow") that is a new feature commit. We found a race condition in the DMA init sequence that hits if the PHY already has link up during stmmac_hw_setup. Since the ring length was programmed after enabling the RX path, we might receive a packet before the correct ring length is programmed. When that happened we could not get reliable interrupts for DMA RX and the MTL complained about RX FIFO overrun. Signed-off-by: Lars Persson <larper(a)axis.com> Cc: stable(a)vger.kernel.org # 4.14.x Cc: Giuseppe Cavallaro <peppe.cavallaro(a)st.com> Cc: Alexandre Torgue <alexandre.torgue(a)st.com> Cc: Jose Abreu <joabreu(a)synopsys.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 4a9dbee6f054..f2429ec07b57 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2536,9 +2536,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) netdev_warn(priv->dev, "%s: failed debugFS registration\n", __func__); #endif - /* Start the ball rolling... */ - stmmac_start_all_dma(priv); - priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS; if ((priv->use_riwt) && (priv->hw->dma->rx_watchdog)) { @@ -2558,6 +2555,9 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) priv->hw->dma->enable_tso(priv->ioaddr, 1, chan); } + /* Start the ball rolling... */ + stmmac_start_all_dma(priv); + return 0; } -- 2.11.0

6 years, 5 months

2
1
0 0

LLD patches for x86_64

by Nathan Chancellor

Hi Greg and Sasha, Please apply the following mbox files to their respective trees. They contain upstream patches that allow a tip of tree LLD to link an x86 kernel image as well as a patch to avoid using $(LD) to check for the location of binutils, which won't always be accurate when linking with LLD. This was tested with both the upstream defconfig and Android's x86_64_cuttlefish_defconfig in their respective trees (building/linking with both Clang/LLD and GCC/ld.bfd then booting in QEMU). For 5.0, a simple cherry-pick of commit ad15006cc784 ("kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD") will do. Greg, the merge into kernel/common will result in two conflicts: * Makefile: Make the diff match upstream commit ad15006cc784 ("kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD") * arch/x86/entry/vdso/Makefile: Take the right hand side, effectively replacing common commit 35b779802c2e ("x86: vdso: Fix leaky vdso linker with CC=clang.") with the proper upstream commit 379d98ddf413 ("x86: vdso: Use $LD instead of $CC to link") Also, while you are at it, would you mind picking up upstream commit 5f074f3e192f ("lib/string.c: implement a basic bcmp")? It is cc'd for stable but it's worth mentioning now so we can stop carrying it out of tree :) Let me know if there are any issues, comments, or concerns, Nathan

6 years, 5 months

3
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror