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

Patch "drm/amdgpu: fix get_max_engine_clock_in_mhz" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled drm/amdgpu: fix get_max_engine_clock_in_mhz to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: drm-amdgpu-fix-get_max_engine_clock_in_mhz.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:16 CET 2018 From: Felix Kuehling <Felix.Kuehling(a)amd.com> Date: Mon, 27 Nov 2017 18:29:43 -0500 Subject: drm/amdgpu: fix get_max_engine_clock_in_mhz From: Felix Kuehling <Felix.Kuehling(a)amd.com> [ Upstream commit a9efcc19161e20623c285fac967a32842972cebe ] Use proper powerplay function. This fixes OpenCL initialization problems. Signed-off-by: Felix Kuehling <Felix.Kuehling(a)amd.com> Acked-by: Oded Gabbay <oded.gabbay(a)gmail.com> Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -265,6 +265,9 @@ uint32_t get_max_engine_clock_in_mhz(str { struct amdgpu_device *adev = (struct amdgpu_device *)kgd; - /* The sclk is in quantas of 10kHz */ - return adev->pm.dpm.dyn_state.max_clock_voltage_on_ac.sclk / 100; + /* the sclk is in quantas of 10kHz */ + if (amdgpu_sriov_vf(adev)) + return adev->clock.default_sclk / 100; + + return amdgpu_dpm_get_sclk(adev, false) / 100; } Patches currently in stable-queue which might be from Felix.Kuehling(a)amd.com are queue-4.14/drm-amdgpu-fix-get_max_engine_clock_in_mhz.patch queue-4.14/drm-amdkfd-fix-memory-leaks-in-kfd-topology.patch

7 years, 7 months

1
0
0 0

Patch "dmaengine: qcom_hidma: check pending interrupts" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dmaengine: qcom_hidma: check pending interrupts to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dmaengine-qcom_hidma-check-pending-interrupts.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Sinan Kaya <okaya(a)codeaurora.org> Date: Tue, 14 Nov 2017 09:55:01 -0500 Subject: dmaengine: qcom_hidma: check pending interrupts From: Sinan Kaya <okaya(a)codeaurora.org> [ Upstream commit 38680bc6b1e3592bc9e18adc1d6e259667df27ce ] Driver is missing the interrupts if two requests are queued up at the same time as the interrupt handler is servicing a request that was just delivered. The ISR clears the interrupt at the end but it could be clearing the interrupt for an outstanding event. Therefore, second interrupt never arrives. Clear the interrupt first and then check for completions. Also, make sure that request start and interrupt clear do not overlap in time by using a spinlock. Signed-off-by: Sinan Kaya <okaya(a)codeaurora.org> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma/qcom/hidma_ll.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -393,6 +393,8 @@ static int hidma_ll_reset(struct hidma_l */ static void hidma_ll_int_handler_internal(struct hidma_lldev *lldev, int cause) { + unsigned long irqflags; + if (cause & HIDMA_ERR_INT_MASK) { dev_err(lldev->dev, "error 0x%x, disabling...\n", cause); @@ -410,6 +412,10 @@ static void hidma_ll_int_handler_interna return; } + spin_lock_irqsave(&lldev->lock, irqflags); + writel_relaxed(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); + spin_unlock_irqrestore(&lldev->lock, irqflags); + /* * Fine tuned for this HW... * @@ -421,9 +427,6 @@ static void hidma_ll_int_handler_interna * Try to consume as many EVREs as possible. */ hidma_handle_tre_completion(lldev); - - /* We consumed TREs or there are pending TREs or EVREs. */ - writel_relaxed(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); } irqreturn_t hidma_ll_inthandler(int chirq, void *arg) Patches currently in stable-queue which might be from okaya(a)codeaurora.org are queue-4.14/dmaengine-qcom_hidma-check-pending-interrupts.patch

7 years, 7 months

1
0
0 0

Patch "dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dmaengine-bcm2835-dma-use-vchan_terminate_vdesc-instead-of-desc_free.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Tue, 14 Nov 2017 16:32:07 +0200 Subject: dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> [ Upstream commit de92436ac40ffe9933230aa503e24dbb5ede9201 ] To avoid race with vchan_complete, use the race free way to terminate running transfer. Implement the device_synchronize callback to make sure that the terminated descriptor is freed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Eric Anholt <eric(a)anholt.net> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma/bcm2835-dma.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -812,7 +812,7 @@ static int bcm2835_dma_terminate_all(str * c->desc is NULL and exit.) */ if (c->desc) { - bcm2835_dma_desc_free(&c->desc->vd); + vchan_terminate_vdesc(&c->desc->vd); c->desc = NULL; bcm2835_dma_abort(c->chan_base); @@ -836,6 +836,13 @@ static int bcm2835_dma_terminate_all(str return 0; } +static void bcm2835_dma_synchronize(struct dma_chan *chan) +{ + struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); + + vchan_synchronize(&c->vc); +} + static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq, unsigned int irq_flags) { @@ -942,6 +949,7 @@ static int bcm2835_dma_probe(struct plat od->ddev.device_prep_dma_memcpy = bcm2835_dma_prep_dma_memcpy; od->ddev.device_config = bcm2835_dma_slave_config; od->ddev.device_terminate_all = bcm2835_dma_terminate_all; + od->ddev.device_synchronize = bcm2835_dma_synchronize; od->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); od->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV) | Patches currently in stable-queue which might be from peter.ujfalusi(a)ti.com are queue-4.14/dmaengine-bcm2835-dma-use-vchan_terminate_vdesc-instead-of-desc_free.patch queue-4.14/dmaengine-amba-pl08x-use-vchan_terminate_vdesc-instead-of-desc_free.patch

7 years, 7 months

1
0
0 0

Patch "dmaengine: amba-pl08x: Use vchan_terminate_vdesc() instead of desc_free" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dmaengine: amba-pl08x: Use vchan_terminate_vdesc() instead of desc_free to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dmaengine-amba-pl08x-use-vchan_terminate_vdesc-instead-of-desc_free.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Tue, 14 Nov 2017 16:32:09 +0200 Subject: dmaengine: amba-pl08x: Use vchan_terminate_vdesc() instead of desc_free From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> [ Upstream commit 47d71bc75d072ce25c1063aa629e55e1cfb961b2 ] To avoid race with vchan_complete, use the race free way to terminate running transfer. Implement the device_synchronize callback to make sure that the terminated descriptor is freed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviewed-by: Linus Walleij <linus.walleij(a)linaro.org> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/dma/amba-pl08x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -2182,7 +2182,7 @@ static int pl08x_terminate_all(struct dm } /* Dequeue jobs and free LLIs */ if (plchan->at) { - pl08x_desc_free(&plchan->at->vd); + vchan_terminate_vdesc(&plchan->at->vd); plchan->at = NULL; } /* Dequeue jobs not yet fired as well */ @@ -2193,6 +2193,13 @@ static int pl08x_terminate_all(struct dm return 0; } +static void pl08x_synchronize(struct dma_chan *chan) +{ + struct pl08x_dma_chan *plchan = to_pl08x_chan(chan); + + vchan_synchronize(&plchan->vc); +} + static int pl08x_pause(struct dma_chan *chan) { struct pl08x_dma_chan *plchan = to_pl08x_chan(chan); @@ -2773,6 +2780,7 @@ static int pl08x_probe(struct amba_devic pl08x->memcpy.device_pause = pl08x_pause; pl08x->memcpy.device_resume = pl08x_resume; pl08x->memcpy.device_terminate_all = pl08x_terminate_all; + pl08x->memcpy.device_synchronize = pl08x_synchronize; pl08x->memcpy.src_addr_widths = PL80X_DMA_BUSWIDTHS; pl08x->memcpy.dst_addr_widths = PL80X_DMA_BUSWIDTHS; pl08x->memcpy.directions = BIT(DMA_MEM_TO_MEM); @@ -2802,6 +2810,7 @@ static int pl08x_probe(struct amba_devic pl08x->slave.device_pause = pl08x_pause; pl08x->slave.device_resume = pl08x_resume; pl08x->slave.device_terminate_all = pl08x_terminate_all; + pl08x->slave.device_synchronize = pl08x_synchronize; pl08x->slave.src_addr_widths = PL80X_DMA_BUSWIDTHS; pl08x->slave.dst_addr_widths = PL80X_DMA_BUSWIDTHS; pl08x->slave.directions = Patches currently in stable-queue which might be from peter.ujfalusi(a)ti.com are queue-4.14/dmaengine-bcm2835-dma-use-vchan_terminate_vdesc-instead-of-desc_free.patch queue-4.14/dmaengine-amba-pl08x-use-vchan_terminate_vdesc-instead-of-desc_free.patch

7 years, 7 months

1
0
0 0

Patch "dma-buf/fence: Fix lock inversion within dma-fence-array" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dma-buf/fence: Fix lock inversion within dma-fence-array to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dma-buf-fence-fix-lock-inversion-within-dma-fence-array.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:16 CET 2018 From: Chris Wilson <chris(a)chris-wilson.co.uk> Date: Tue, 14 Nov 2017 16:27:19 +0000 Subject: dma-buf/fence: Fix lock inversion within dma-fence-array From: Chris Wilson <chris(a)chris-wilson.co.uk> [ Upstream commit 03e4e0a9e02cf703da331ff6cfd57d0be9bf5692 ] Ages ago Rob Clark noted, "Currently with fence-array, we have a potential deadlock situation. If we fence_add_callback() on an array-fence, the array-fence's lock is acquired first, and in it's ->enable_signaling() callback, it will install cbs on it's array-member fences, so the array-member's lock is acquired second. But in the signal path, the array-member's lock is acquired first, and the array-fence's lock acquired second." Rob proposed either extensive changes to dma-fence to unnest the fence-array signaling, or to defer the signaling onto a workqueue. This is a more refined version of the later, that should keep the latency of the fence signaling to a minimum by using an irq-work, which is executed asap. Reported-by: Rob Clark <robdclark(a)gmail.com> Suggested-by: Rob Clark <robdclark(a)gmail.com> References: 1476635975-21981-1-git-send-email-robdclark(a)gmail.com Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Rob Clark <robdclark(a)gmail.com> Cc: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Christian König <christian.koenig(a)amd.com> Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20171114162719.30958-1-chris@… Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/base/Kconfig | 1 + drivers/dma-buf/dma-fence-array.c | 14 ++++++++++++-- include/linux/dma-fence-array.h | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -249,6 +249,7 @@ config DMA_SHARED_BUFFER bool default n select ANON_INODES + select IRQ_WORK help This option enables the framework for buffer-sharing between multiple drivers. A buffer is associated with a file using driver --- a/drivers/dma-buf/dma-fence-array.c +++ b/drivers/dma-buf/dma-fence-array.c @@ -31,6 +31,14 @@ static const char *dma_fence_array_get_t return "unbound"; } +static void irq_dma_fence_array_work(struct irq_work *wrk) +{ + struct dma_fence_array *array = container_of(wrk, typeof(*array), work); + + dma_fence_signal(&array->base); + dma_fence_put(&array->base); +} + static void dma_fence_array_cb_func(struct dma_fence *f, struct dma_fence_cb *cb) { @@ -39,8 +47,9 @@ static void dma_fence_array_cb_func(stru struct dma_fence_array *array = array_cb->array; if (atomic_dec_and_test(&array->num_pending)) - dma_fence_signal(&array->base); - dma_fence_put(&array->base); + irq_work_queue(&array->work); + else + dma_fence_put(&array->base); } static bool dma_fence_array_enable_signaling(struct dma_fence *fence) @@ -136,6 +145,7 @@ struct dma_fence_array *dma_fence_array_ spin_lock_init(&array->lock); dma_fence_init(&array->base, &dma_fence_array_ops, &array->lock, context, seqno); + init_irq_work(&array->work, irq_dma_fence_array_work); array->num_fences = num_fences; atomic_set(&array->num_pending, signal_on_any ? 1 : num_fences); --- a/include/linux/dma-fence-array.h +++ b/include/linux/dma-fence-array.h @@ -21,6 +21,7 @@ #define __LINUX_DMA_FENCE_ARRAY_H #include <linux/dma-fence.h> +#include <linux/irq_work.h> /** * struct dma_fence_array_cb - callback helper for fence array @@ -47,6 +48,8 @@ struct dma_fence_array { unsigned num_fences; atomic_t num_pending; struct dma_fence **fences; + + struct irq_work work; }; extern const struct dma_fence_ops dma_fence_array_ops; Patches currently in stable-queue which might be from chris(a)chris-wilson.co.uk are queue-4.14/dma-buf-fence-fix-lock-inversion-within-dma-fence-array.patch queue-4.14/agp-intel-flush-all-chipset-writes-after-updating-the-ggtt.patch

7 years, 7 months

1
0
0 0

Patch "dm raid: fix raid set size revalidation" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled dm raid: fix raid set size revalidation to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: dm-raid-fix-raid-set-size-revalidation.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Heinz Mauelshagen <heinzm(a)redhat.com> Date: Sat, 2 Dec 2017 01:03:51 +0100 Subject: dm raid: fix raid set size revalidation From: Heinz Mauelshagen <heinzm(a)redhat.com> [ Upstream commit 61e06e2c3ebd986050958513bfa40dceed756f8f ] The raid set size is being revalidated unconditionally before a reshaping conversion is started. MD requires the size to only be reduced in case of a stripe removing (i.e. shrinking) reshape but not when growing because the raid array has to stay small until after the growing reshape finishes. Fix by avoiding the size revalidation in preresume unless a shrinking reshape is requested. Signed-off-by: Heinz Mauelshagen <heinzm(a)redhat.com> Signed-off-by: Mike Snitzer <snitzer(a)redhat.com> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/md/dm-raid.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -675,15 +675,11 @@ static struct raid_type *get_raid_type_b return NULL; } -/* - * Conditionally change bdev capacity of @rs - * in case of a disk add/remove reshape - */ -static void rs_set_capacity(struct raid_set *rs) +/* Adjust rdev sectors */ +static void rs_set_rdev_sectors(struct raid_set *rs) { struct mddev *mddev = &rs->md; struct md_rdev *rdev; - struct gendisk *gendisk = dm_disk(dm_table_get_md(rs->ti->table)); /* * raid10 sets rdev->sector to the device size, which @@ -692,8 +688,16 @@ static void rs_set_capacity(struct raid_ rdev_for_each(rdev, mddev) if (!test_bit(Journal, &rdev->flags)) rdev->sectors = mddev->dev_sectors; +} - set_capacity(gendisk, mddev->array_sectors); +/* + * Change bdev capacity of @rs in case of a disk add/remove reshape + */ +static void rs_set_capacity(struct raid_set *rs) +{ + struct gendisk *gendisk = dm_disk(dm_table_get_md(rs->ti->table)); + + set_capacity(gendisk, rs->md.array_sectors); revalidate_disk(gendisk); } @@ -1674,8 +1678,11 @@ static void do_table_event(struct work_s struct raid_set *rs = container_of(ws, struct raid_set, md.event_work); smp_rmb(); /* Make sure we access most actual mddev properties */ - if (!rs_is_reshaping(rs)) + if (!rs_is_reshaping(rs)) { + if (rs_is_raid10(rs)) + rs_set_rdev_sectors(rs); rs_set_capacity(rs); + } dm_table_event(rs->ti->table); } @@ -3845,11 +3852,10 @@ static int raid_preresume(struct dm_targ mddev->resync_min = mddev->recovery_cp; } - rs_set_capacity(rs); - /* Check for any reshape request unless new raid set */ if (test_and_clear_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) { /* Initiate a reshape. */ + rs_set_rdev_sectors(rs); mddev_lock_nointr(mddev); r = rs_start_reshape(rs); mddev_unlock(mddev); @@ -3878,6 +3884,10 @@ static void raid_resume(struct dm_target mddev->ro = 0; mddev->in_sync = 0; + /* Only reduce raid set size before running a disk removing reshape. */ + if (mddev->delta_disks < 0) + rs_set_capacity(rs); + /* * Keep the RAID set frozen if reshape/rebuild flags are set. * The RAID set is unfrozen once the next table load/resume, Patches currently in stable-queue which might be from heinzm(a)redhat.com are queue-4.14/dm-raid-fix-raid-set-size-revalidation.patch

7 years, 7 months

1
0
0 0

Patch "crypto: ecc - Fix NULL pointer deref. on no default_rng" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled crypto: ecc - Fix NULL pointer deref. on no default_rng to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: crypto-ecc-fix-null-pointer-deref.-on-no-default_rng.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Pierre <pinaraf(a)pinaraf.info> Date: Sun, 12 Nov 2017 15:24:32 +0100 Subject: crypto: ecc - Fix NULL pointer deref. on no default_rng From: Pierre <pinaraf(a)pinaraf.info> [ Upstream commit 4c0e22c90510308433272d7ba281b1eb4eda8209 ] If crypto_get_default_rng returns an error, the function ecc_gen_privkey should return an error. Instead, it currently tries to use the default_rng nevertheless, thus creating a kernel panic with a NULL pointer dereference. Returning the error directly, as was supposedly intended when looking at the code, fixes this. Signed-off-by: Pierre Ducroquet <pinaraf(a)pinaraf.info> Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar(a)gmail.com> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- crypto/ecc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/crypto/ecc.c +++ b/crypto/ecc.c @@ -964,7 +964,7 @@ int ecc_gen_privkey(unsigned int curve_i * DRBG with a security strength of 256. */ if (crypto_get_default_rng()) - err = -EFAULT; + return -EFAULT; err = crypto_rng_get_bytes(crypto_default_rng, (u8 *)priv, nbytes); crypto_put_default_rng(); Patches currently in stable-queue which might be from pinaraf(a)pinaraf.info are queue-4.14/crypto-ecc-fix-null-pointer-deref.-on-no-default_rng.patch

7 years, 7 months

1
0
0 0

Patch "crypto: cavium - fix memory leak on info" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled crypto: cavium - fix memory leak on info to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: crypto-cavium-fix-memory-leak-on-info.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: Colin Ian King <colin.king(a)canonical.com> Date: Wed, 15 Nov 2017 12:37:19 +0000 Subject: crypto: cavium - fix memory leak on info From: Colin Ian King <colin.king(a)canonical.com> [ Upstream commit 87aae50af730a28dc1d8846d86dca5e9aa724a9f ] The object info is being leaked on an error return path, fix this by setting ret to -ENOMEM and exiting via the request_cleanup path that will free info. Detected by CoverityScan, CID#1408439 ("Resource Leak") Fixes: c694b233295b ("crypto: cavium - Add the Virtual Function driver for CPT") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c +++ b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c @@ -459,7 +459,8 @@ int process_request(struct cpt_vf *cptvf info->completion_addr = kzalloc(sizeof(union cpt_res_s), GFP_KERNEL); if (unlikely(!info->completion_addr)) { dev_err(&pdev->dev, "Unable to allocate memory for completion_addr\n"); - return -ENOMEM; + ret = -ENOMEM; + goto request_cleanup; } result = (union cpt_res_s *)info->completion_addr; Patches currently in stable-queue which might be from colin.king(a)canonical.com are queue-4.14/usbip-vudc-fix-null-pointer-dereference-on-udc-lock.patch queue-4.14/crypto-cavium-fix-memory-leak-on-info.patch queue-4.14/staging-rtl8822be-fix-missing-null-check-on-dev_alloc_skb-return.patch

7 years, 7 months

1
0
0 0

Patch "crypto: caam/qi - use correct print specifier for size_t" has been added to the 4.14-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled crypto: caam/qi - use correct print specifier for size_t to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: crypto-caam-qi-use-correct-print-specifier-for-size_t.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Mar 16 15:43:17 CET 2018 From: "Horia Geantă" <horia.geanta(a)nxp.com> Date: Tue, 28 Nov 2017 18:48:08 +0200 Subject: crypto: caam/qi - use correct print specifier for size_t From: "Horia Geantă" <horia.geanta(a)nxp.com> [ Upstream commit 9db09e3bad65393dc23b0279beb7f3754d77065c ] Fix below warnings on ARMv7 by using %zu for printing size_t values: drivers/crypto/caam/caamalg_qi.c: In function aead_edesc_alloc: drivers/crypto/caam/caamalg_qi.c:417:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] sizeof(struct qm_sg_entry)) ^ drivers/crypto/caam/caamalg_qi.c:672:16: note: in expansion of macro CAAM_QI_MAX_AEAD_SG qm_sg_ents, CAAM_QI_MAX_AEAD_SG); ^ drivers/crypto/caam/caamalg_qi.c: In function ablkcipher_edesc_alloc: drivers/crypto/caam/caamalg_qi.c:440:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] sizeof(struct qm_sg_entry)) ^ drivers/crypto/caam/caamalg_qi.c:909:16: note: in expansion of macro CAAM_QI_MAX_ABLKCIPHER_SG qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); ^ drivers/crypto/caam/caamalg_qi.c: In function ablkcipher_giv_edesc_alloc: drivers/crypto/caam/caamalg_qi.c:440:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] sizeof(struct qm_sg_entry)) ^ drivers/crypto/caam/caamalg_qi.c:1062:16: note: in expansion of macro CAAM_QI_MAX_ABLKCIPHER_SG qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); ^ Fixes: eb9ba37dc15a ("crypto: caam/qi - handle large number of S/Gs case") Signed-off-by: Horia Geantă <horia.geanta(a)nxp.com> Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/crypto/caam/caamalg_qi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c @@ -668,7 +668,7 @@ static struct aead_edesc *aead_edesc_all qm_sg_ents = 1 + !!ivsize + mapped_src_nents + (mapped_dst_nents > 1 ? mapped_dst_nents : 0); if (unlikely(qm_sg_ents > CAAM_QI_MAX_AEAD_SG)) { - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", qm_sg_ents, CAAM_QI_MAX_AEAD_SG); caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, iv_dma, ivsize, op_type, 0, 0); @@ -905,7 +905,7 @@ static struct ablkcipher_edesc *ablkciph qm_sg_ents += mapped_dst_nents > 1 ? mapped_dst_nents : 0; if (unlikely(qm_sg_ents > CAAM_QI_MAX_ABLKCIPHER_SG)) { - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, iv_dma, ivsize, op_type, 0, 0); @@ -1058,7 +1058,7 @@ static struct ablkcipher_edesc *ablkciph } if (unlikely(qm_sg_ents > CAAM_QI_MAX_ABLKCIPHER_SG)) { - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, iv_dma, ivsize, GIVENCRYPT, 0, 0); Patches currently in stable-queue which might be from horia.geanta(a)nxp.com are queue-4.14/crypto-caam-qi-use-correct-print-specifier-for-size_t.patch

7 years, 7 months

1
0
0 0

[GIT PULL] commits for Linux 4.14

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi Greg, Pleae pull commits for Linux 4.14 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit 267ef1d332845c1d361ff3fd1d346613a12db773: Linux 4.14.23 (2018-02-28 10:19:45 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.14-15032018 for you to fetch changes up to 2ede5ea423a423f349548f13bbd31430c9a045eb: dmaengine: qcom_hidma: check pending interrupts (2018-03-13 16:20:22 -0400) - ---------------------------------------------------------------- for-greg-4.14-15032018 - ---------------------------------------------------------------- Adam Thomson (1): typec: tcpm: fusb302: Resolve out of order messaging events Adiel Aloni (1): mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED Adrian Hunter (1): mmc: mmc_test: Ensure command queue is disabled for testing Alexey Khoroshilov (1): rtc: brcmstb-waketimer: fix error handling in brcmstb_waketmr_probe() Andrew F. Davis (2): ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin ARM: dts: omap3-n900: Fix the audio CODEC's reset pin Arnd Bergmann (1): IB/mlx5: revisit -Wmaybe-uninitialized warning Axel Lin (1): pwm: stmpe: Fix wrong register offset for hwpwm=2 case Bart Van Assche (1): scsi: core: scsi_get_device_flags_keyed(): Always return device flags Ben Greear (1): ath10k: fix invalid STS_CAP_OFFSET_MASK Bjorn Andersson (1): leds: pm8058: Silence pointer to integer size warning Chris Wilson (2): dma-buf/fence: Fix lock inversion within dma-fence-array agp/intel: Flush all chipset writes after updating the GGTT Christophe JAILLET (2): power: supply: ab8500_charger: Fix an error handling path power: supply: ab8500_charger: Bail out in case of error in 'ab8500_charger_init_hw_registers()' Christophe Leroy (1): Fix misannotated out-of-line _copy_to_user() Colin Ian King (2): staging: rtl8822be: fix missing null check on dev_alloc_skb return crypto: cavium - fix memory leak on info Dan Carpenter (2): media: cpia2: Fix a couple off by one bugs ASoC: nuc900: Fix a loop timeout test Davidlohr Bueso (1): locking/locktorture: Fix num reader/writer corner cases Emmanuel Grumbach (1): iwlwifi: mvm: rs: don't override the rate history in the search cycle Eric W. Biederman (1): userns: Don't fail follow_automount based on s_user_ns Fabrizio Castro (1): pinctrl: sh-pfc: r8a7791: Add can_clk function Felix Kuehling (1): drm/amdgpu: fix get_max_engine_clock_in_mhz Geert Uytterhoeven (1): arm64: dts: renesas: salvator-common: Add EthernetAVB PHY reset Gustavo A. R. Silva (1): media: davinci: vpif_capture: add NULL check on devm_kzalloc return value Hans de Goede (1): HID: multitouch: Only look at non touch fields in first packet of a frame Heinz Mauelshagen (1): dm raid: fix raid set size revalidation Horia GeantÄƒ (1): crypto: caam/qi - use correct print specifier for size_t Jagdish Gediya (1): mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 Jani Nikula (1): drm/edid: set ELD connector type in drm_edid_to_eld() Jernej Skrabec (1): drm/sun4i: Fix format mask in DE2 driver Jiri Kosina (1): HID: elo: clear BTN_LEFT mapping Johan Hovold (1): USB: ledtrig-usbport: fix of-node leak John Fastabend (1): net: sched: drop qdisc_reset from dev_graft_qdisc Josh Poimboeuf (1): powerpc/modules: Don't try to restore r2 after a sibling call Julien BOIBESSOT (1): tools/usbip: fixes build with musl libc toolchain Kieran Bingham (1): media: vsp1: Prevent suspending and resuming DRM pipelines Li Dongyang (1): scsi: ses: don't ask for diagnostic pages repeatedly during probe Limin Zhu (1): mwifiex: cfg80211: do not change virtual interface during scan processing Lorenzo Colitti (1): net: xfrm: allow clearing socket xfrm policies. Luca Coelho (1): mac80211: remove BUG() when interface type is invalid Luis R. Rodriguez (1): test_firmware: fix setting old custom fw path back on exit Mahesh Bandewar (1): ipvlan: add L2 check for packets arriving via virtual devices Manikanta Pubbisetty (1): ath10k: update tdls teardown state to target Michael Chan (1): bnxt_en: Don't print "Link speed -1 no longer supported" messages. Michael Hennerich (1): net: ieee802154: adf7242: Fix bug if defined DEBUG Mimi Zohar (1): ima: relax requiring a file signature for new files with zero length Miquel Raynal (1): mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]() Monk Liu (2): drm/amdgpu:fix random missing of FLR NOTIFY drm/amdgpu:fix virtual dce bug Nicholas Piggin (1): powerpc/64: Don't trace irqs-off at interrupt return to soft-disabled context Paul E. McKenney (2): sched: Stop switched_to_rt() from sending IPIs to offline CPUs sched: Stop resched_cpu() from sending IPIs to offline CPUs Peter Meerwald-Stadler (1): iio: health: max30102: Add power enable parameter to get_temp function Peter Ujfalusi (2): dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free dmaengine: amba-pl08x: Use vchan_terminate_vdesc() instead of desc_free Philipp Zabel (1): drm/etnaviv: make THERMAL selectable Pierre (1): crypto: ecc - Fix NULL pointer deref. on no default_rng Rafael J. Wysocki (1): cpufreq: Fix governor module removal race Sara Sharon (1): iwlwifi: mvm: avoid dumping assert log when device is stopped SeongJae Park (1): rcutorture/configinit: Fix build directory error message Simon Horman (1): ARM: dts: koelsch: Move cec_clock to root node Simon Shields (1): ARM: dts: exynos: Correct Trats2 panel reset line Sinan Kaya (1): dmaengine: qcom_hidma: check pending interrupts Srinivas Kandagatla (1): clk: qcom: msm8916: fix mnd_width for codec_digcodec Stefan BrÃ¼ns (1): iio: adc: ina2xx: Shift bus voltage register to mask flag bits Stephen Hemminger (1): veth: set peer GSO values Sunil Goutham (1): net: thunderx: Set max queue count taking XDP_TX into account Takeshi Kihara (1): pinctrl: sh-pfc: r8a7795-es1: Fix MOD_SEL1 bit[25:24] to 0x3 when using STP_ISEN_1_D Tero Kristo (1): clk: ti: clkctrl: add support for retrying failed init Thomas Richter (2): perf annotate: Fix unnecessary memory allocation for s390x perf annotate: Fix objdump comment parsing for Intel mov dissassembly Tobias Jordan (1): spi: sun6i: disable/unprepare clocks on remove Toshiaki Makita (1): virtio_net: Disable interrupts if napi_complete_done rescheduled napi Ville SyrjÃ¤lÃ¤ (1): video/hdmi: Allow "empty" HDMI infoframes Xose Vazquez Perez (2): scsi: devinfo: apply to HP XP the same flags as Hitachi VSP scsi: dh: add new rdac devices Yixun Lan (1): clk: meson: gxbb: fix wrong clock for SARADC/SANA Yong Zhao (1): drm/amdkfd: Fix memory leaks in kfd topology Yossef Efraim (1): xfrm: Fix xfrm_replay_overflow_offload_esn arch/arm/boot/dts/am335x-pepper.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 4 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++-- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 + arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/kernel/entry_64.S | 10 ++- arch/powerpc/kernel/module_64.c | 12 +++- arch/powerpc/lib/code-patching.c | 5 ++ crypto/ecc.c | 2 +- drivers/base/Kconfig | 1 + drivers/char/agp/intel-gtt.c | 2 + drivers/clk/meson/gxbb.c | 4 +- drivers/clk/qcom/gcc-msm8916.c | 1 + drivers/clk/ti/clkctrl.c | 12 +++- drivers/cpufreq/cpufreq.c | 6 ++ drivers/crypto/caam/caamalg_qi.c | 6 +- drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 3 +- drivers/dma-buf/dma-fence-array.c | 14 +++- drivers/dma/amba-pl08x.c | 11 +++- drivers/dma/bcm2835-dma.c | 10 ++- drivers/dma/qcom/hidma_ll.c | 9 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 14 +++- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +++ drivers/gpu/drm/drm_edid.c | 9 ++- drivers/gpu/drm/etnaviv/Kconfig | 9 +++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 ++- drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 +- drivers/hid/hid-elo.c | 6 ++ drivers/hid/hid-multitouch.c | 17 ++++- drivers/iio/adc/ina2xx-adc.c | 26 +++++--- drivers/iio/health/max30102.c | 36 ++++++---- drivers/infiniband/hw/mlx5/mr.c | 3 + drivers/leds/leds-pm8058.c | 2 +- drivers/md/dm-raid.c | 30 ++++++--- drivers/media/platform/davinci/vpif_capture.c | 2 + drivers/media/platform/vsp1/vsp1_drv.c | 16 ++++- drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- drivers/mmc/core/mmc_test.c | 11 +++- drivers/mtd/nand/fsl_ifc_nand.c | 7 ++ drivers/mtd/nand/nand_base.c | 9 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 ++- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 ++ drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ipvlan/ipvlan_core.c | 4 ++ drivers/net/veth.c | 3 + drivers/net/virtio_net.c | 9 ++- drivers/net/wireless/ath/ath10k/mac.c | 10 +++ drivers/net/wireless/ath/ath10k/wmi.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 ++ drivers/net/wireless/mac80211_hwsim.c | 17 +++-- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 22 ++++++- drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 2 +- drivers/power/supply/ab8500_charger.c | 6 +- drivers/pwm/pwm-stmpe.c | 2 +- drivers/rtc/rtc-brcmstb-waketimer.c | 15 ++++- drivers/scsi/scsi_devinfo.c | 9 +-- drivers/scsi/scsi_dh.c | 5 +- drivers/scsi/ses.c | 11 ++-- drivers/spi/spi-sun6i.c | 2 +- drivers/staging/rtlwifi/rtl8822be/fw.c | 2 + drivers/staging/typec/fusb302/fusb302.c | 21 ++++-- drivers/usb/core/ledtrig-usbport.c | 8 ++- drivers/video/hdmi.c | 51 +++++++++------ fs/namei.c | 3 - include/linux/dma-fence-array.h | 3 + kernel/locking/locktorture.c | 76 +++++++++++++--------- kernel/sched/core.c | 3 +- kernel/sched/rt.c | 2 +- lib/usercopy.c | 2 +- net/mac80211/iface.c | 2 +- net/sched/sch_generic.c | 28 +++++--- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_replay.c | 3 +- net/xfrm/xfrm_state.c | 7 ++ security/integrity/ima/ima_appraise.c | 3 +- sound/soc/nuc900/nuc900-ac97.c | 4 +- tools/perf/arch/s390/annotate/instructions.c | 3 +- tools/perf/util/annotate.c | 8 ++- tools/testing/selftests/firmware/fw_filesystem.sh | 5 +- .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- tools/usb/usbip/src/usbipd.c | 2 +- 86 files changed, 548 insertions(+), 209 deletions(-) -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJaqvZNAAoJEN6mb/eXdyzcHWMP/3lJxr82b2+5mnUlBQmXySNA oRcB6DU3bqIdfMNip++DZHAUNaXNk26tFBSoxbNtAmNt+JOwO/pQhK+MnSIO5CZh 3sDkQuNhKrqV0LdcH/HsxiUSvQxRMrt2H5NIONOpW2Ionizu8Mvj8c/J/0lLUjJa rFf/DhXZU5oDYpyu1ukdYMaV1xEYUMMrV3B7MVRp6IcVEsjbbuU29odj7GZHkJcN awKOg69m+lGix4HvHMQpjh7+Omx3x1jTA0l6feFbqO1QRRIWXE8is0sJpiA5LpIe +6GulmRwKvPtm0R0GMqODS5/nyYojNu6ncbKQOxCZHZlGwCstVB9VTvrd21U/R0Q As+ktY4APbNAqemNF1LOk6TgxOgB7umXA93wKwVUBK0AEhBMY7zJeWDG73q5oHmj D38cpkgUaY+VHNE9Cz4/3CKsXXPkSupzIbz94FL56/W1aHNl9vVC/a6J8ybfhVIw WhbC+pxPbxow0znsk2rUtTcAk4cv+zJzwzzhT5D1x/GZ6D+KOwIEg3w/ZqR0lELY ciWIbnBDftF/i6KjvAqU4JOoldQl3aaMzUzU1ZHO6pgSyFSabOzjOJ9Ae5KpTzEc HsU1Tyh5Jjd/VCQWFwf0xE+gO5uTAGvo0XU/EDnH7FbDMW7vIvld6VRIMWjtH99B Jwox8Yds93ubSoqOX5Pt =qdx5 -----END PGP SIGNATURE-----

7 years, 7 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror