Commit eabd7d24 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Greg Kroah-Hartman

stm class: Prevent division by zero

commit bf7cbaae upstream.

Using STP_POLICY_ID_SET ioctl command with dummy_stm device, or any STM
device that supplies zero mmio channel size, will trigger a division by
zero bug in the kernel.

Prevent this by disallowing channel widths other than 1 for such devices.
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: 7bd1d409 ("stm class: Introduce an abstraction for System Trace Module devices")
CC: stable@vger.kernel.org # v4.4+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3139fbb
...@@ -553,7 +553,7 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg) ...@@ -553,7 +553,7 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg)
{ {
struct stm_device *stm = stmf->stm; struct stm_device *stm = stmf->stm;
struct stp_policy_id *id; struct stp_policy_id *id;
int ret = -EINVAL; int ret = -EINVAL, wlimit = 1;
u32 size; u32 size;
if (stmf->output.nr_chans) if (stmf->output.nr_chans)
...@@ -581,8 +581,10 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg) ...@@ -581,8 +581,10 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg)
if (id->__reserved_0 || id->__reserved_1) if (id->__reserved_0 || id->__reserved_1)
goto err_free; goto err_free;
if (id->width < 1 || if (stm->data->sw_mmiosz)
id->width > PAGE_SIZE / stm->data->sw_mmiosz) wlimit = PAGE_SIZE / stm->data->sw_mmiosz;
if (id->width < 1 || id->width > wlimit)
goto err_free; goto err_free;
ret = stm_file_assign(stmf, id->id, id->width); ret = stm_file_assign(stmf, id->id, id->width);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment