[U-Boot] [PATCH 1/2] pwm: imx: Prevent NULL pointer dereference
pwm_id_to_reg() can return NULL, so add NULL testing to prevent NULL pointer dereference.
Signed-off-by: Axel Lin axel.lin@ingics.com --- drivers/pwm/pwm-imx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 40bf027..47799fc 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -18,6 +18,9 @@ int pwm_init(int pwm_id, int div, int invert) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm) + return -1; + writel(0, &pwm->ir); return 0; } @@ -28,6 +31,9 @@ int pwm_config(int pwm_id, int duty_ns, int period_ns) unsigned long period_cycles, duty_cycles, prescale; u32 cr;
+ if (!pwm) + return -1; + pwm_imx_get_parms(period_ns, duty_ns, &period_cycles, &duty_cycles, &prescale);
@@ -47,6 +53,9 @@ int pwm_enable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm) + return -1; + setbits_le32(&pwm->cr, PWMCR_EN); return 0; } @@ -55,5 +64,8 @@ void pwm_disable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
+ if (!pwm) + return; + clrbits_le32(&pwm->cr, PWMCR_EN); }
The break after return is unreachable code, remove it.
Signed-off-by: Axel Lin axel.lin@ingics.com --- drivers/pwm/pwm-imx-util.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c index 79d86028..f92c370 100644 --- a/drivers/pwm/pwm-imx-util.c +++ b/drivers/pwm/pwm-imx-util.c @@ -21,16 +21,12 @@ struct pwm_regs *pwm_id_to_reg(int pwm_id) switch (pwm_id) { case 0: return (struct pwm_regs *)PWM1_BASE_ADDR; - break; case 1: return (struct pwm_regs *)PWM2_BASE_ADDR; - break; case 2: return (struct pwm_regs *)PWM3_BASE_ADDR; - break; case 3: return (struct pwm_regs *)PWM4_BASE_ADDR; - break; default: printf("unknown pwm_id: %d\n", pwm_id); break;
On 23/05/2015 09:17, Axel Lin wrote:
The break after return is unreachable code, remove it.
Signed-off-by: Axel Lin axel.lin@ingics.com
drivers/pwm/pwm-imx-util.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c index 79d86028..f92c370 100644 --- a/drivers/pwm/pwm-imx-util.c +++ b/drivers/pwm/pwm-imx-util.c @@ -21,16 +21,12 @@ struct pwm_regs *pwm_id_to_reg(int pwm_id) switch (pwm_id) { case 0: return (struct pwm_regs *)PWM1_BASE_ADDR;
break;break;break;break;
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Hello Axel,
Am 23.05.2015 09:17, schrieb Axel Lin:
The break after return is unreachable code, remove it.
Signed-off-by: Axel Lin axel.lin@ingics.com
drivers/pwm/pwm-imx-util.c | 4 ---- 1 file changed, 4 deletions(-)
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c index 79d86028..f92c370 100644 --- a/drivers/pwm/pwm-imx-util.c +++ b/drivers/pwm/pwm-imx-util.c @@ -21,16 +21,12 @@ struct pwm_regs *pwm_id_to_reg(int pwm_id) switch (pwm_id) { case 0: return (struct pwm_regs *)PWM1_BASE_ADDR;
break;break;break;break;
On 23/05/2015 09:17, Axel Lin wrote:
The break after return is unreachable code, remove it.
Signed-off-by: Axel Lin axel.lin@ingics.com
drivers/pwm/pwm-imx-util.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c index 79d86028..f92c370 100644 --- a/drivers/pwm/pwm-imx-util.c +++ b/drivers/pwm/pwm-imx-util.c @@ -21,16 +21,12 @@ struct pwm_regs *pwm_id_to_reg(int pwm_id) switch (pwm_id) { case 0: return (struct pwm_regs *)PWM1_BASE_ADDR;
break;break;break;break;
Applied to u-boot-imx, thanks!
Best regards, Stefano Babic
Hi Axel,
On 23/05/2015 09:16, Axel Lin wrote:
pwm_id_to_reg() can return NULL, so add NULL testing to prevent NULL pointer dereference.
Signed-off-by: Axel Lin axel.lin@ingics.com
drivers/pwm/pwm-imx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 40bf027..47799fc 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -18,6 +18,9 @@ int pwm_init(int pwm_id, int div, int invert) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return -1;- writel(0, &pwm->ir); return 0;
} @@ -28,6 +31,9 @@ int pwm_config(int pwm_id, int duty_ns, int period_ns) unsigned long period_cycles, duty_cycles, prescale; u32 cr;
- if (!pwm)
return -1;- pwm_imx_get_parms(period_ns, duty_ns, &period_cycles, &duty_cycles, &prescale);
@@ -47,6 +53,9 @@ int pwm_enable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return -1;- setbits_le32(&pwm->cr, PWMCR_EN); return 0;
} @@ -55,5 +64,8 @@ void pwm_disable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return;- clrbits_le32(&pwm->cr, PWMCR_EN);
}
Right !
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
Hello Axel,
Am 23.05.2015 09:16, schrieb Axel Lin:
pwm_id_to_reg() can return NULL, so add NULL testing to prevent NULL pointer dereference.
Signed-off-by: Axel Lin axel.lin@ingics.com
drivers/pwm/pwm-imx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Acked-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 40bf027..47799fc 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -18,6 +18,9 @@ int pwm_init(int pwm_id, int div, int invert) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return -1;- writel(0, &pwm->ir); return 0; }
@@ -28,6 +31,9 @@ int pwm_config(int pwm_id, int duty_ns, int period_ns) unsigned long period_cycles, duty_cycles, prescale; u32 cr;
- if (!pwm)
return -1;- pwm_imx_get_parms(period_ns, duty_ns, &period_cycles, &duty_cycles, &prescale);
@@ -47,6 +53,9 @@ int pwm_enable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return -1;- setbits_le32(&pwm->cr, PWMCR_EN); return 0; }
@@ -55,5 +64,8 @@ void pwm_disable(int pwm_id) { struct pwm_regs *pwm = (struct pwm_regs *)pwm_id_to_reg(pwm_id);
- if (!pwm)
return;- clrbits_le32(&pwm->cr, PWMCR_EN); }
On 23/05/2015 09:16, Axel Lin wrote:
pwm_id_to_reg() can return NULL, so add NULL testing to prevent NULL pointer dereference.
Signed-off-by: Axel Lin axel.lin@ingics.com
Applied to u-boot-imx, thanks!
Best regards, Stefano Babic
participants (3)
-
Axel Lin -
Heiko Schocher -
Stefano Babic