lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amiserial: prepare for locking relaxation in caller

Browse Source 
Just wrap this one in a lock_kernel. As I understand it there is no M68K
SMP anyway.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox
2008-04-30 00:53:16 -07:00
committed by Linus Torvalds
parent 00cd5c37af
commit e18ce49b5b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/char/amiserial.c
View File

@@ -1074,6 +1074,7 @@ static int get_serial_info(struct async_struct * info,
if (!retinfo) if (!retinfo)
return -EFAULT; return -EFAULT;
memset(&tmp, 0, sizeof(tmp)); memset(&tmp, 0, sizeof(tmp));
lock_kernel();
tmp.type = state->type; tmp.type = state->type;
tmp.line = state->line; tmp.line = state->line;
tmp.port = state->port; tmp.port = state->port;
@@ -1084,6 +1085,7 @@ static int get_serial_info(struct async_struct * info,
tmp.close_delay = state->close_delay; tmp.close_delay = state->close_delay;
tmp.closing_wait = state->closing_wait; tmp.closing_wait = state->closing_wait;
tmp.custom_divisor = state->custom_divisor; tmp.custom_divisor = state->custom_divisor;
unlock_kernel();
if (copy_to_user(retinfo,&tmp,sizeof(*retinfo))) if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
@@ -1099,13 +1101,17 @@ static int set_serial_info(struct async_struct * info,
if (copy_from_user(&new_serial,new_info,sizeof(new_serial))) if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
return -EFAULT; return -EFAULT;
lock_kernel();
state = info->state; state = info->state;
old_state = *state; old_state = *state;
change_irq = new_serial.irq != state->irq; change_irq = new_serial.irq != state->irq;
change_port = (new_serial.port != state->port); change_port = (new_serial.port != state->port);
if(change_irq || change_port || (new_serial.xmit_fifo_size != state->xmit_fifo_size)) if(change_irq || change_port || (new_serial.xmit_fifo_size != state->xmit_fifo_size)) {
unlock_kernel();
return -EINVAL; return -EINVAL;
}
if (!serial_isroot()) { if (!serial_isroot()) {
if ((new_serial.baud_base != state->baud_base) || if ((new_serial.baud_base != state->baud_base) ||
@@ -1122,8 +1128,10 @@ static int set_serial_info(struct async_struct * info,
goto check_and_exit; goto check_and_exit;
} }
if (new_serial.baud_base < 9600) if (new_serial.baud_base < 9600) {
unlock_kernel();
return -EINVAL; return -EINVAL;
}
/* /*
* OK, past this point, all the error checking has been done. * OK, past this point, all the error checking has been done.
@@ -1157,6 +1165,7 @@ check_and_exit:
} }
} else } else
retval = startup(info); retval = startup(info);
unlock_kernel();
return retval; return retval;
} }