summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@openedhand.com>2007-09-27 09:42:26 +0000
committerSamuel Ortiz <sameo@openedhand.com>2007-09-27 09:42:26 +0000
commit5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c (patch)
tree13b179b2cce30dde411377006432b5eccc54f9e3
parent939d45757811335c6a9ccde8d7a769d84b0512f3 (diff)
downloadpoky-5c5c08405ce2ff99e6b1ddf71e6710f7ee81790c.tar.gz
linux-rp-2.6.22+2.6.23-rc4: Release console semaphore on an error path.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2813 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch16
-rw-r--r--meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb2
2 files changed, 12 insertions, 6 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
index 8f53b55a30..5a51d1c3f5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
+++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/vt_ioctl_race.patch
@@ -1,11 +1,11 @@
1--- 1---
2 drivers/char/vt_ioctl.c | 4 ++-- 2 drivers/char/vt_ioctl.c | 8 +++++---
3 1 file changed, 2 insertions(+), 2 deletions(-) 3 1 file changed, 5 insertions(+), 3 deletions(-)
4 4
5Index: linux-2.6.22/drivers/char/vt_ioctl.c 5Index: linux-2.6.22/drivers/char/vt_ioctl.c
6=================================================================== 6===================================================================
7--- linux-2.6.22.orig/drivers/char/vt_ioctl.c 2007-07-09 01:32:17.000000000 +0200 7--- linux-2.6.22.orig/drivers/char/vt_ioctl.c 2007-07-09 01:32:17.000000000 +0200
8+++ linux-2.6.22/drivers/char/vt_ioctl.c 2007-09-27 11:05:29.000000000 +0200 8+++ linux-2.6.22/drivers/char/vt_ioctl.c 2007-09-27 11:58:42.000000000 +0200
9@@ -770,6 +770,7 @@ 9@@ -770,6 +770,7 @@
10 /* 10 /*
11 * Switching-from response 11 * Switching-from response
@@ -30,9 +30,15 @@ Index: linux-2.6.22/drivers/char/vt_ioctl.c
30 } 30 }
31 } 31 }
32 32
33@@ -813,6 +812,7 @@ 33@@ -810,9 +809,12 @@
34 if (arg != VT_ACKACQ) 34 /*
35 * If it's just an ACK, ignore it
36 */
37- if (arg != VT_ACKACQ)
38+ if (arg != VT_ACKACQ) {
39+ release_console_sem();
35 return -EINVAL; 40 return -EINVAL;
41+ }
36 } 42 }
37+ release_console_sem(); 43+ release_console_sem();
38 44
diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
index 02ef0994a8..c1883800b5 100644
--- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6DEFAULT_PREFERENCE_htcuniversal = "1" 6DEFAULT_PREFERENCE_htcuniversal = "1"