2013-01-12 10:47:09

by Nathan Hintz

Subject: [PATCH 2/5] bcma: jump to 'out' label for invalid 'func' value

Consistently jump to the 'out' label for error conditions (adds
missing check for 'func' validity in bcma_extpci_write_config).

Signed-off-by: Nathan Hintz <[email protected]>
---
drivers/bcma/driver_pci_host.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index 56073a5..187cc9f 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -94,7 +94,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
if (dev == 0) {
/* we support only two functions on device 0 */
if (func > 1)
- return -EINVAL;
+ goto out;

/* accesses to config registers with offsets >= 256
* requires indirect access.
@@ -157,6 +157,10 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
if (unlikely(len != 1 && len != 2 && len != 4))
goto out;
if (dev == 0) {
+ /* we support only two functions on device 0 */
+ if (func > 1)
+ goto out;
+
/* accesses to config registers with offsets >= 256
* requires indirect access.
*/
--
1.7.7.6

2013-01-12 14:19:00

by Hauke Mehrtens

Subject: Re: [PATCH 2/5] bcma: jump to 'out' label for invalid 'func' value

On 01/12/2013 11:46 AM, Nathan Hintz wrote:
> Consistently jump to the 'out' label for error conditions (adds
> missing check for 'func' validity in bcma_extpci_write_config).
>
> Signed-off-by: Nathan Hintz <[email protected]>

Acked-by: Hauke Mehrtens <[email protected]>

> ---
> drivers/bcma/driver_pci_host.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
> index 56073a5..187cc9f 100644
> --- a/drivers/bcma/driver_pci_host.c
> +++ b/drivers/bcma/driver_pci_host.c
> @@ -94,7 +94,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
> if (dev == 0) {
> /* we support only two functions on device 0 */
> if (func > 1)
> - return -EINVAL;
> + goto out;
>
> /* accesses to config registers with offsets >= 256
> * requires indirect access.
> @@ -157,6 +157,10 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
> if (unlikely(len != 1 && len != 2 && len != 4))
> goto out;
> if (dev == 0) {
> + /* we support only two functions on device 0 */
> + if (func > 1)
> + goto out;
> +
> /* accesses to config registers with offsets >= 256
> * requires indirect access.
> */
>