summaryrefslogtreecommitdiff
path: root/target/linux/s3c24xx/patches-2.6.24/1163-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch
blob: 8161aae416bd9274964fadf1ed557e276e9d0b9c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From 7d34adf0df1f105c73c6ecdee50a7ad6a6dbfd2b Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Tue, 3 Jun 2008 10:46:48 +0100
Subject: [PATCH] Fix possible null pointer dereference in s3c24xx_i2c_resume

From 0b9bae6aed5268707b348e48a01411ba420844e1 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Tue, 27 May 2008 14:41:35 +0200
Subject: [PATCH] [janitor] Fix possible null pointer dereference
     Judging by the control flow of the resume method i2c->suspended++ could
     lead to a null pointer dereference.
---
 drivers/i2c/busses/i2c-s3c2410.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 5ac8309..bd69127 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -919,10 +919,10 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
 {
 	struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
 
-	if (i2c != NULL)
+	if (i2c != NULL) {
 		s3c24xx_i2c_init(i2c);
-
-	i2c->suspended--;
+		i2c->suspended--;
+	}
 
 	return 0;
 }
-- 
1.5.6.5