upcoming pull request for v3.6-rcX - net/master

upcoming pull request for v3.6-rcX - net/master

[Marc Kleine-Budde]

Hello,

I'm going to send this two patches to David. Tests and comments welcome.

Marc

[PATCH 1/2] can: softing: Fix potential memory leak in softing_load_fw()

[Marc Kleine-Budde]

From: Alexey Khoroshilov <khoroshilov@ispras.ru>

Do not leak memory by updating pointer with potentially NULL realloc return value.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/softing/softing_fw.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
index 3105961..b595d34 100644
--- a/drivers/net/can/softing/softing_fw.c
+++ b/drivers/net/can/softing/softing_fw.c
@@ -150,7 +150,7 @@ int softing_load_fw(const char *file, struct softing *card,
 	const uint8_t *mem, *end, *dat;
 	uint16_t type, len;
 	uint32_t addr;
-	uint8_t *buf = NULL;
+	uint8_t *buf = NULL, *new_buf;
 	int buflen = 0;
 	int8_t type_end = 0;
 
@@ -199,11 +199,12 @@ int softing_load_fw(const char *file, struct softing *card,
 		if (len > buflen) {
 			/* align buflen */
 			buflen = (len + (1024-1)) & ~(1024-1);
-			buf = krealloc(buf, buflen, GFP_KERNEL);
-			if (!buf) {
+			new_buf = krealloc(buf, buflen, GFP_KERNEL);
+			if (!new_buf) {
 				ret = -ENOMEM;
 				goto failed;
 			}
+			buf = new_buf;
 		}
 		/* verify record data */
 		memcpy_fromio(buf, &dpram[addr + offset], len);
-- 
1.7.10

[PATCH 2/2] can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

[Marc Kleine-Budde]

From: "Schmitt, Sven (EVM/8)" <Sven.Schmitt@volkswagen.de>

The sja1000 platform driver wrongly assumes that a shared IRQ is indicated
with the IRQF_SHARED flag in irq resource flags. This patch changes the
driver to handle the correct flag IORESOURCE_IRQ_SHAREABLE instead.

There are no mainline users of the platform driver which wrongly make use
of IRQF_SHARED.

Signed-off-by: Sven Schmitt <sven.schmitt@volkswagen.de>
Acked-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/sja1000/sja1000_platform.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 4f50145..662c5f7 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -109,7 +109,9 @@ static int sp_probe(struct platform_device *pdev)
 	priv = netdev_priv(dev);
 
 	dev->irq = res_irq->start;
-	priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED);
+	priv->irq_flags = res_irq->flags & IRQF_TRIGGER_MASK;
+	if (res_irq->flags & IORESOURCE_IRQ_SHAREABLE)
+		priv->irq_flags |= IRQF_SHARED;
 	priv->reg_base = addr;
 	/* The CAN clock frequency is half the oscillator clock frequency */
 	priv->can.clock.freq = pdata->osc_freq / 2;
-- 
1.7.10

Re: [PATCH 2/2] can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]

Hello Sven,

On 08/10/2012 10:54 AM, Marc Kleine-Budde wrote:
> From: "Schmitt, Sven (EVM/8)" <Sven.Schmitt@volkswagen.de>
> 
> The sja1000 platform driver wrongly assumes that a shared IRQ is indicated
> with the IRQF_SHARED flag in irq resource flags. This patch changes the
> driver to handle the correct flag IORESOURCE_IRQ_SHAREABLE instead.
> 
> There are no mainline users of the platform driver which wrongly make use
> of IRQF_SHARED.
> 
> Signed-off-by: Sven Schmitt <sven.schmitt@volkswagen.de>
> Acked-by: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

I just noticed that your email addresses are slightly different, which
do you prefer?

    "Schmitt, Sven (EVM/8)" <Sven.Schmitt@volkswagen.de>
    Sven Schmitt <sven.schmitt@volkswagen.de>

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

AW: [PATCH 2/2] can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

[Schmitt, Sven (EVM/8)]

I prefer the simple one:
Sven Schmitt <sven.schmitt@volkswagen.de>

i am checking if my mail client allows me to use this simple one.

Sven


-----Ursprüngliche Nachricht-----
Von: linux-can-owner@vger.kernel.org [mailto:linux-can-owner@vger.kernel.org] Im Auftrag von Marc Kleine-Budde
Gesendet: Freitag, 10. August 2012 10:57
An: Marc Kleine-Budde
Cc: linux-can@vger.kernel.org; Schmitt, Sven (EVM/8)
Betreff: Re: [PATCH 2/2] can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

Hello Sven,

On 08/10/2012 10:54 AM, Marc Kleine-Budde wrote:
> From: "Schmitt, Sven (EVM/8)" <Sven.Schmitt@volkswagen.de>
> 
> The sja1000 platform driver wrongly assumes that a shared IRQ is indicated
> with the IRQF_SHARED flag in irq resource flags. This patch changes the
> driver to handle the correct flag IORESOURCE_IRQ_SHAREABLE instead.
> 
> There are no mainline users of the platform driver which wrongly make use
> of IRQF_SHARED.
> 
> Signed-off-by: Sven Schmitt <sven.schmitt@volkswagen.de>
> Acked-by: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

I just noticed that your email addresses are slightly different, which
do you prefer?

    "Schmitt, Sven (EVM/8)" <Sven.Schmitt@volkswagen.de>
    Sven Schmitt <sven.schmitt@volkswagen.de>

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Re: AW: [PATCH 2/2] can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

On 08/10/2012 11:11 AM, Schmitt, Sven (EVM/8) wrote:
> I prefer the simple one:
> Sven Schmitt <sven.schmitt@volkswagen.de>
> 
> i am checking if my mail client allows me to use this simple one.

Okay, I'm changing the author of the commit then.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

pull-request: can 2012-08-24

[Marc Kleine-Budde]

Hello David,

here are two fixes for the v3.6 release cycle. Alexey Khoroshilov submitted a
fix for a memory leak in the softing driver (in softing_load_fw()) in case a
krealloc() fails. Sven Schmitt fixed the misuse of the IRQF_SHARED flag in the
irq resouce of the sja1000 platform driver, now the correct flag is used. There
are no mainline users of this feature which need to be converted.

regards, Marc


The following changes since commit a0dfb2634e5671770f598cda08002d8cda66ac77:

  af_packet: match_fanout_group() can be static (2012-08-23 09:27:12 -0700)

are available in the git repository at:

  git://gitorious.org/linux-can/linux-can.git fixes-for-3.6

for you to fetch changes up to da3d50ef308d53f216f1f92f4971f245c13e9f65:

  can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing (2012-08-24 10:54:05 +0200)

----------------------------------------------------------------
Alexey Khoroshilov (1):
      can: softing: Fix potential memory leak in softing_load_fw()

Sven Schmitt (1):
      can: sja1000_platform: fix wrong flag IRQF_SHARED for interrupt sharing

 drivers/net/can/sja1000/sja1000_platform.c |    4 +++-
 drivers/net/can/softing/softing_fw.c       |    7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

[PATCH 1/2] can: softing: Fix potential memory leak in softing_load_fw()

[Marc Kleine-Budde]

From: Alexey Khoroshilov <khoroshilov@ispras.ru>

Do not leak memory by updating pointer with potentially NULL realloc return value.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/softing/softing_fw.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
index 3105961..b595d34 100644
--- a/drivers/net/can/softing/softing_fw.c
+++ b/drivers/net/can/softing/softing_fw.c
@@ -150,7 +150,7 @@ int softing_load_fw(const char *file, struct softing *card,
 	const uint8_t *mem, *end, *dat;
 	uint16_t type, len;
 	uint32_t addr;
-	uint8_t *buf = NULL;
+	uint8_t *buf = NULL, *new_buf;
 	int buflen = 0;
 	int8_t type_end = 0;
 
@@ -199,11 +199,12 @@ int softing_load_fw(const char *file, struct softing *card,
 		if (len > buflen) {
 			/* align buflen */
 			buflen = (len + (1024-1)) & ~(1024-1);
-			buf = krealloc(buf, buflen, GFP_KERNEL);
-			if (!buf) {
+			new_buf = krealloc(buf, buflen, GFP_KERNEL);
+			if (!new_buf) {
 				ret = -ENOMEM;
 				goto failed;
 			}
+			buf = new_buf;
 		}
 		/* verify record data */
 		memcpy_fromio(buf, &dpram[addr + offset], len);
-- 
1.7.10