aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Eibach <eibach@gdsys.de>2009-06-18 19:49:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 19:46:06 -0400
commita90b037583d5f1ae3e54e9c687c79df82d1d34a4 (patch)
treea399772347bfa16ba9ee76caa9a14105987b8c01
parent0b9ce5a20138590bd9556e34a0408164fadf4163 (diff)
char: moxa, prevent opening unavailable ports
In moxa.c there are 32 minor numbers reserved for each device. The number of ports actually available per device is stored in moxa_board_conf->numPorts. This number is not considered in moxa_open(). Opening a port that is not available results in a kernel oops. This patch adds a test to moxa_open() that prevents opening unavailable ports. [akpm@linux-foundation.org: avoid multiple returns] Signed-off-by: Dirk Eibach <eibach@gdsys.de> Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/moxa.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 65b6ff2442c6..6799588b0099 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -1189,6 +1189,11 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
1189 return -ENODEV; 1189 return -ENODEV;
1190 } 1190 }
1191 1191
1192 if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
1193 retval = -ENODEV;
1194 goto out_unlock;
1195 }
1196
1192 ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; 1197 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
1193 ch->port.count++; 1198 ch->port.count++;
1194 tty->driver_data = ch; 1199 tty->driver_data = ch;
@@ -1213,8 +1218,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
1213 moxa_close_port(tty); 1218 moxa_close_port(tty);
1214 } else 1219 } else
1215 ch->port.flags |= ASYNC_NORMAL_ACTIVE; 1220 ch->port.flags |= ASYNC_NORMAL_ACTIVE;
1221out_unlock:
1216 mutex_unlock(&moxa_openlock); 1222 mutex_unlock(&moxa_openlock);
1217
1218 return retval; 1223 return retval;
1219} 1224}
1220 1225