LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2.6.20-rc5 1/7] ehea: Fixed wrong dereferencation
@ 2007-01-22 11:52 Thomas Klein
  2007-01-23  5:59 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Klein @ 2007-01-22 11:52 UTC (permalink / raw)
  To: Jeff Garzik
  Cc: Christoph Raisch, Jan-Bernd Themann, Jan-Bernd Themann,
	linux-kernel, linux-ppc, Marcus Eder, netdev, Thomas Klein,
	Stefan Roscher, Stefan Roscher

Not only check the pointer against 0 but also the dereferenced value

Signed-off-by: Thomas Klein <tklein@de.ibm.com>
---


 drivers/net/ehea/ehea.h      |    2 +-
 drivers/net/ehea/ehea_main.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)


diff -Nurp -X dontdiff linux-2.6.20-rc5/drivers/net/ehea/ehea.h patched_kernel/drivers/net/ehea/ehea.h
--- linux-2.6.20-rc5/drivers/net/ehea/ehea.h	2007-01-12 19:54:26.000000000 +0100
+++ patched_kernel/drivers/net/ehea/ehea.h	2007-01-19 13:56:41.000000000 +0100
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME	"ehea"
-#define DRV_VERSION	"EHEA_0043"
+#define DRV_VERSION	"EHEA_0044"
 
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
 	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
diff -Nurp -X dontdiff linux-2.6.20-rc5/drivers/net/ehea/ehea_main.c patched_kernel/drivers/net/ehea/ehea_main.c
--- linux-2.6.20-rc5/drivers/net/ehea/ehea_main.c	2007-01-12 19:54:26.000000000 +0100
+++ patched_kernel/drivers/net/ehea/ehea_main.c	2007-01-19 13:58:01.000000000 +0100
@@ -2471,14 +2471,16 @@ static int __devinit ehea_probe(struct i
 
 	adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
 					    NULL);
-	if (!adapter_handle) {
+	if (adapter_handle)
+		adapter->handle = *adapter_handle;
+
+	if (!adapter->handle) {
 		dev_err(&dev->ofdev.dev, "failed getting handle for adapter"
 			" '%s'\n", dev->ofdev.node->full_name);
 		ret = -ENODEV;
 		goto out_free_ad;
 	}
 
-	adapter->handle = *adapter_handle;
 	adapter->pd = EHEA_PD_ID;
 
 	dev->ofdev.dev.driver_data = adapter;


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 2.6.20-rc5 1/7] ehea: Fixed wrong dereferencation
  2007-01-22 11:52 [PATCH 2.6.20-rc5 1/7] ehea: Fixed wrong dereferencation Thomas Klein
@ 2007-01-23  5:59 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-01-23  5:59 UTC (permalink / raw)
  To: Thomas Klein
  Cc: Christoph Raisch, Jan-Bernd Themann, Jan-Bernd Themann,
	linux-kernel, linux-ppc, Marcus Eder, netdev, Thomas Klein,
	Stefan Roscher, Stefan Roscher, Paul Mackerras

Thomas Klein wrote:
> Not only check the pointer against 0 but also the dereferenced value
> 
> Signed-off-by: Thomas Klein <tklein@de.ibm.com>
> ---
> 
> 
>  drivers/net/ehea/ehea.h      |    2 +-
>  drivers/net/ehea/ehea_main.c |    6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)

applied 1-7 to #upstream-fixes


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-01-23  5:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-22 11:52 [PATCH 2.6.20-rc5 1/7] ehea: Fixed wrong dereferencation Thomas Klein
2007-01-23  5:59 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).