sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KERNEL - do_privctl() fix

Browse source 
- after a driver is restarted, do not register permissions
  which are already set again.
This commit is contained in:
Tomas Hruby 2011-10-18 18:19:24 +00:00 committed by Tomas Hruby
parent fecaba7ff1
commit 8d0a1f71bf
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kernel/system/do_privctl.c
View file

@ -187,6 +187,13 @@ PUBLIC int do_privctl(struct proc * caller, message * m_ptr)
data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR, data_copy(caller->p_endpoint, (vir_bytes) m_ptr->CTL_ARG_PTR,
KERNEL, (vir_bytes) &io_range, sizeof(io_range)); KERNEL, (vir_bytes) &io_range, sizeof(io_range));
priv(rp)->s_flags |= CHECK_IO_PORT; /* Check I/O accesses */ priv(rp)->s_flags |= CHECK_IO_PORT; /* Check I/O accesses */
for (i = 0; i < priv(rp)->s_nr_io_range; i++) {
if (priv(rp)->s_io_tab[i].ior_base == io_range.ior_base &&
priv(rp)->s_io_tab[i].ior_limit == io_range.ior_limit)
return OK;
}
i= priv(rp)->s_nr_io_range; i= priv(rp)->s_nr_io_range;
if (i >= NR_IO_RANGE) { if (i >= NR_IO_RANGE) {
printf("do_privctl: %d already has %d i/o ranges.\n", printf("do_privctl: %d already has %d i/o ranges.\n",
@ -213,6 +220,14 @@ PUBLIC int do_privctl(struct proc * caller, message * m_ptr)
KERNEL, (vir_bytes) &mem_range, sizeof(mem_range))) != OK) KERNEL, (vir_bytes) &mem_range, sizeof(mem_range))) != OK)
return r; return r;
priv(rp)->s_flags |= CHECK_MEM; /* Check memory mappings */ priv(rp)->s_flags |= CHECK_MEM; /* Check memory mappings */
/* When restarting a driver, check if it already has the premission */
for (i = 0; i < priv(rp)->s_nr_mem_range; i++) {
if (priv(rp)->s_mem_tab[i].mr_base == mem_range.mr_base &&
priv(rp)->s_mem_tab[i].mr_limit == mem_range.mr_limit)
return OK;
}
i= priv(rp)->s_nr_mem_range; i= priv(rp)->s_nr_mem_range;
if (i >= NR_MEM_RANGE) { if (i >= NR_MEM_RANGE) {
printf("do_privctl: %d already has %d mem ranges.\n", printf("do_privctl: %d already has %d mem ranges.\n",
@ -238,6 +253,12 @@ PUBLIC int do_privctl(struct proc * caller, message * m_ptr)
KERNEL, (vir_bytes) &irq, sizeof(irq)); KERNEL, (vir_bytes) &irq, sizeof(irq));
priv(rp)->s_flags |= CHECK_IRQ; /* Check IRQs */ priv(rp)->s_flags |= CHECK_IRQ; /* Check IRQs */
/* When restarting a driver, check if it already has the premission */
for (i = 0; i < priv(rp)->s_nr_irq; i++) {
if (priv(rp)->s_irq_tab[i] == irq)
return OK;
}
i= priv(rp)->s_nr_irq; i= priv(rp)->s_nr_irq;
if (i >= NR_IRQ) { if (i >= NR_IRQ) {
printf("do_privctl: %d already has %d irq's.\n", printf("do_privctl: %d already has %d irq's.\n",