Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a number of uses of uninitialized variables by adding assertions

Browse Source 
or other sanity checks, code reshuffling, or fixing broken behavior.
This commit is contained in:
Kees van Reeuwijk
2010-01-27 10:23:58 +00:00
parent c6eb51d66a
commit 2ba237cd4e
14 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/floppy/floppy.c
View File

@@ -642,18 +642,18 @@ unsigned nr_req; /* length of request vector */
if (*up != NO_OFFSET) break;
fp->fl_sector++;
}
}
if (r == OK && opcode == DEV_SCATTER_S) {
/* Copy the user bytes to the DMA buffer. */
if(proc_nr != SELF) {
s=sys_safecopyfrom(proc_nr, *ug, *up,
(vir_bytes) floppy_buf,
(phys_bytes) SECTOR_SIZE, D);
if(s != OK)
panic("FLOPPY", "sys_safecopyfrom failed", s);
} else {
memcpy(floppy_buf, (void *) (*ug + *up), SECTOR_SIZE);
if (opcode == DEV_SCATTER_S) {
/* Copy the user bytes to the DMA buffer. */
if(proc_nr != SELF) {
s=sys_safecopyfrom(proc_nr, *ug, *up,
(vir_bytes) floppy_buf,
(phys_bytes) SECTOR_SIZE, D);
if(s != OK)
panic("FLOPPY", "sys_safecopyfrom failed", s);
} else {
memcpy(floppy_buf, (void *) (*ug + *up), SECTOR_SIZE);
}
}
}