2017-08-22 08:11:44

by Himanshu Jha

Subject: [PATCH] drivers: net: wireless: atmel: check memory allocation failure

Check memory allocation failure and return -ENOMEM if failure
occurs.

Signed-off-by: Himanshu Jha <[email protected]>
---
drivers/net/wireless/atmel/at76c50x-usb.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c
index 09defbc..73f0924 100644
--- a/drivers/net/wireless/atmel/at76c50x-usb.c
+++ b/drivers/net/wireless/atmel/at76c50x-usb.c
@@ -940,7 +940,7 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_MAC_ADDR, m,
sizeof(struct mib_mac_addr));
@@ -969,7 +969,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
struct mib_mac_wep *m = kmalloc(sizeof(struct mib_mac_wep), GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_MAC_WEP, m,
sizeof(struct mib_mac_wep));
@@ -1006,7 +1006,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, m,
sizeof(struct mib_mac_mgmt));
@@ -1043,7 +1043,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
struct mib_mac *m = kmalloc(sizeof(struct mib_mac), GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));
if (ret < 0) {
@@ -1080,7 +1080,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
struct mib_phy *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));
if (ret < 0) {
@@ -1113,7 +1113,7 @@ static void at76_dump_mib_local(struct at76_priv *priv)
struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m));
if (ret < 0) {
@@ -1138,7 +1138,7 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv)
struct mib_mdomain *m = kmalloc(sizeof(struct mib_mdomain), GFP_KERNEL);

if (!m)
- return;
+ return -ENOMEM;

ret = at76_get_mib(priv->udev, MIB_MDOMAIN, m,
sizeof(struct mib_mdomain));
--
2.7.4

2017-08-22 08:41:52

by Matteo Croce

Subject: Re: [PATCH] drivers: net: wireless: atmel: check memory allocation failure

Il giorno mar, 22/08/2017 alle 13.41 +0530, Himanshu Jha ha scritto:
> Check memory allocation failure and return -ENOMEM if failure
> occurs.
>
> Signed-off-by: Himanshu Jha <[email protected]>
> ---
> drivers/net/wireless/atmel/at76c50x-usb.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c
> b/drivers/net/wireless/atmel/at76c50x-usb.c
> index 09defbc..73f0924 100644
> --- a/drivers/net/wireless/atmel/at76c50x-usb.c
> +++ b/drivers/net/wireless/atmel/at76c50x-usb.c
> @@ -940,7 +940,7 @@ static void at76_dump_mib_mac_addr(struct
> at76_priv *priv)
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_MAC_ADDR, m,
> sizeof(struct mib_mac_addr));
> @@ -969,7 +969,7 @@ static void at76_dump_mib_mac_wep(struct
> at76_priv *priv)
> struct mib_mac_wep *m = kmalloc(sizeof(struct mib_mac_wep),
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_MAC_WEP, m,
> sizeof(struct mib_mac_wep));
> @@ -1006,7 +1006,7 @@ static void at76_dump_mib_mac_mgmt(struct
> at76_priv *priv)
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, m,
> sizeof(struct mib_mac_mgmt));
> @@ -1043,7 +1043,7 @@ static void at76_dump_mib_mac(struct at76_priv
> *priv)
> struct mib_mac *m = kmalloc(sizeof(struct mib_mac),
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct
> mib_mac));
> if (ret < 0) {
> @@ -1080,7 +1080,7 @@ static void at76_dump_mib_phy(struct at76_priv
> *priv)
> struct mib_phy *m = kmalloc(sizeof(struct mib_phy),
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct
> mib_phy));
> if (ret < 0) {
> @@ -1113,7 +1113,7 @@ static void at76_dump_mib_local(struct
> at76_priv *priv)
> struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m));
> if (ret < 0) {
> @@ -1138,7 +1138,7 @@ static void at76_dump_mib_mdomain(struct
> at76_priv *priv)
> struct mib_mdomain *m = kmalloc(sizeof(struct mib_mdomain),
> GFP_KERNEL);
>
> if (!m)
> - return;
> + return -ENOMEM;
>
> ret = at76_get_mib(priv->udev, MIB_MDOMAIN, m,
> sizeof(struct mib_mdomain));

Perhaps these functions should return something instead of being void.

Regards,

--
Matteo Croce
per aspera ad upstream

2017-08-22 09:29:40

by Himanshu Jha

Subject: Re: [PATCH] drivers: net: wireless: atmel: check memory allocation failure

On Tue, Aug 22, 2017 at 10:41:45AM +0200, Matteo Croce wrote:
> Il giorno mar, 22/08/2017 alle 13.41 +0530, Himanshu Jha ha scritto:
> > Check memory allocation failure and return -ENOMEM if failure
> > occurs.
> >
> > Signed-off-by: Himanshu Jha <[email protected]>
> > ---
> > drivers/net/wireless/atmel/at76c50x-usb.c | 14 +++++++-------
> > 1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c
> > b/drivers/net/wireless/atmel/at76c50x-usb.c
> > index 09defbc..73f0924 100644
> > --- a/drivers/net/wireless/atmel/at76c50x-usb.c
> > +++ b/drivers/net/wireless/atmel/at76c50x-usb.c
> > @@ -940,7 +940,7 @@ static void at76_dump_mib_mac_addr(struct
> > at76_priv *priv)
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_MAC_ADDR, m,
> > sizeof(struct mib_mac_addr));
> > @@ -969,7 +969,7 @@ static void at76_dump_mib_mac_wep(struct
> > at76_priv *priv)
> > struct mib_mac_wep *m = kmalloc(sizeof(struct mib_mac_wep),
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_MAC_WEP, m,
> > sizeof(struct mib_mac_wep));
> > @@ -1006,7 +1006,7 @@ static void at76_dump_mib_mac_mgmt(struct
> > at76_priv *priv)
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, m,
> > sizeof(struct mib_mac_mgmt));
> > @@ -1043,7 +1043,7 @@ static void at76_dump_mib_mac(struct at76_priv
> > *priv)
> > struct mib_mac *m = kmalloc(sizeof(struct mib_mac),
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct
> > mib_mac));
> > if (ret < 0) {
> > @@ -1080,7 +1080,7 @@ static void at76_dump_mib_phy(struct at76_priv
> > *priv)
> > struct mib_phy *m = kmalloc(sizeof(struct mib_phy),
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct
> > mib_phy));
> > if (ret < 0) {
> > @@ -1113,7 +1113,7 @@ static void at76_dump_mib_local(struct
> > at76_priv *priv)
> > struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m));
> > if (ret < 0) {
> > @@ -1138,7 +1138,7 @@ static void at76_dump_mib_mdomain(struct
> > at76_priv *priv)
> > struct mib_mdomain *m = kmalloc(sizeof(struct mib_mdomain),
> > GFP_KERNEL);
> >
> > if (!m)
> > - return;
> > + return -ENOMEM;
> >
> > ret = at76_get_mib(priv->udev, MIB_MDOMAIN, m,
> > sizeof(struct mib_mdomain));
>
> Perhaps these functions should return something instead of being void.
>
> Regards,
>
> --
> Matteo Croce
> per aspera ad upstream

Yes, it should return int to signal memory allocation failures and
therefore function prototype should be static int rather than static
void.

Thanks!

2017-08-23 04:13:52

by Kalle Valo

Subject: Re: [PATCH] drivers: net: wireless: atmel: check memory allocation failure

Himanshu Jha <[email protected]> writes:

> Check memory allocation failure and return -ENOMEM if failure
> occurs.
>
> Signed-off-by: Himanshu Jha <[email protected]>

The title prefix is wrong:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#commit_title_is_wrong

--
Kalle Valo