Patch "staging: fsl-mc/dpio: Fix incorrect comparison" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
staging: fsl-mc/dpio: Fix incorrect comparison
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=summary
The filename of the patch is:
staging-fsl-mc-dpio-fix-incorrect-comparison.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 <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Dec 6 18:04:41 CET 2017
From: Ioana Radulescu <[email protected]>
Date: Thu, 28 Sep 2017 09:10:33 -0500
Subject: staging: fsl-mc/dpio: Fix incorrect comparison
From: Ioana Radulescu <[email protected]>
[ Upstream commit 8dabf52ffb6445fa5bcc8b6d2ecb615f60d0dd12 ]
For some dpio functions, a cpu id parameter value of -1 is valid and means "any". But when trying to validate this param value against an upper limit, in this case num_possible_cpus(), we risk obtaining the wrong result due to an implicit cast.
Avoid an incorrect check result by explicitly comparing the cpu id with the "any" value before verifying the upper bound.
--- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 4 ++-- drivers/staging/fsl-mc/include/dpaa2-io.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/staging/fsl-mc/bus/dpio/dpio-service.c +2 -2
@@ -76,7 +76,7 @@ static inline struct dpaa2_io *service_sif (d)return d; -if (unlikely (cpu >=num_possible_cpus ())) +if (cpu !=DPAA2_IO_ANY_CPU && cpu >=num_possible_cpus ())return NULL ;/*
@@ -121,7 +121,7 @@ struct dpaa2_io *dpaa2_io_create(const sreturn NULL ;/* check if CPU is out of range (-1 means any cpu) */ -if (desc->cpu >=num_possible_cpus ()) { +if (desc->cpu !=DPAA2_IO_ANY_CPU && desc->cpu >=num_possible_cpus ()) {kfree (obj);return NULL ; }
drivers/staging/fsl-mc/include/dpaa2-io.h +4 -2
@@ -54,6 +54,8 @@ struct device;* for dequeue. */ +#define DPAA2_IO_ANY_CPU -1 +/** * struct dpaa2_io_desc - The DPIO descriptor * @receives_notifications: Use notificaton mode. Non-zero if the DPIO
@@ -91,8 +93,8 @@ irqreturn_t dpaa2_io_irq(struct dpaa2_io* @cb: The callback to be invoked when the notification arrives * @is_cdan: Zero for FQDAN, non-zero for CDAN * @id: FQID or channel ID, needed for rearm -* @desired_cpu: The cpu on which the notifications will show up. -1 means -* any CPU. +* @desired_cpu: The cpu on which the notifications will show up. Use +* DPAA2_IO_ANY_CPU if don't care * @dpio_id: The dpio index * @qman64: The 64-bit context value shows up in the FQDAN/CDAN. * @node: The list node
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/staging-fsl-dpaa2-eth-account-for-rx-fd-buffers-on-error-path.patch queue-4.14/staging-fsl-mc-dpio-fix-incorrect-comparison.patch