safe conversion
This commit is contained in:
parent
1c8b206a5d
commit
b80626c878
2 changed files with 25 additions and 13 deletions
|
@ -14,7 +14,7 @@ MAKE = exec make
|
||||||
CC = exec cc
|
CC = exec cc
|
||||||
CFLAGS = -I$i
|
CFLAGS = -I$i
|
||||||
LDFLAGS = -i
|
LDFLAGS = -i
|
||||||
LIBS = -lsys -lsysutil
|
LIBS = -lsysutil -lsys
|
||||||
|
|
||||||
OBJ = main.o random.o sha2.o aes/rijndael_api.o aes/rijndael_alg.o
|
OBJ = main.o random.o sha2.o aes/rijndael_api.o aes/rijndael_alg.o
|
||||||
LIBDRIVER = $d/libdriver/driver.o
|
LIBDRIVER = $d/libdriver/driver.o
|
||||||
|
|
|
@ -26,10 +26,10 @@ extern int errno; /* error number for PM calls */
|
||||||
FORWARD _PROTOTYPE( char *r_name, (void) );
|
FORWARD _PROTOTYPE( char *r_name, (void) );
|
||||||
FORWARD _PROTOTYPE( struct device *r_prepare, (int device) );
|
FORWARD _PROTOTYPE( struct device *r_prepare, (int device) );
|
||||||
FORWARD _PROTOTYPE( int r_transfer, (int proc_nr, int opcode, off_t position,
|
FORWARD _PROTOTYPE( int r_transfer, (int proc_nr, int opcode, off_t position,
|
||||||
iovec_t *iov, unsigned nr_req) );
|
iovec_t *iov, unsigned nr_req, int safe) );
|
||||||
FORWARD _PROTOTYPE( int r_do_open, (struct driver *dp, message *m_ptr) );
|
FORWARD _PROTOTYPE( int r_do_open, (struct driver *dp, message *m_ptr) );
|
||||||
FORWARD _PROTOTYPE( void r_init, (void) );
|
FORWARD _PROTOTYPE( void r_init, (void) );
|
||||||
FORWARD _PROTOTYPE( int r_ioctl, (struct driver *dp, message *m_ptr) );
|
FORWARD _PROTOTYPE( int r_ioctl, (struct driver *dp, message *m_ptr, int safe) );
|
||||||
FORWARD _PROTOTYPE( void r_geometry, (struct partition *entry) );
|
FORWARD _PROTOTYPE( void r_geometry, (struct partition *entry) );
|
||||||
FORWARD _PROTOTYPE( void r_random, (struct driver *dp, message *m_ptr) );
|
FORWARD _PROTOTYPE( void r_random, (struct driver *dp, message *m_ptr) );
|
||||||
|
|
||||||
|
@ -92,18 +92,20 @@ int device;
|
||||||
/*===========================================================================*
|
/*===========================================================================*
|
||||||
* r_transfer *
|
* r_transfer *
|
||||||
*===========================================================================*/
|
*===========================================================================*/
|
||||||
PRIVATE int r_transfer(proc_nr, opcode, position, iov, nr_req)
|
PRIVATE int r_transfer(proc_nr, opcode, position, iov, nr_req, safe)
|
||||||
int proc_nr; /* process doing the request */
|
int proc_nr; /* process doing the request */
|
||||||
int opcode; /* DEV_GATHER or DEV_SCATTER */
|
int opcode; /* DEV_GATHER or DEV_SCATTER */
|
||||||
off_t position; /* offset on device to read or write */
|
off_t position; /* offset on device to read or write */
|
||||||
iovec_t *iov; /* pointer to read or write request vector */
|
iovec_t *iov; /* pointer to read or write request vector */
|
||||||
unsigned nr_req; /* length of request vector */
|
unsigned nr_req; /* length of request vector */
|
||||||
|
int safe; /* safe copies? */
|
||||||
{
|
{
|
||||||
/* Read or write one the driver's minor devices. */
|
/* Read or write one the driver's minor devices. */
|
||||||
unsigned count, left, chunk;
|
unsigned count, left, chunk;
|
||||||
vir_bytes user_vir;
|
vir_bytes user_vir;
|
||||||
struct device *dv;
|
struct device *dv;
|
||||||
unsigned long dv_size;
|
unsigned long dv_size;
|
||||||
|
size_t vir_offset = 0;
|
||||||
|
|
||||||
/* Get minor device number and check for /dev/null. */
|
/* Get minor device number and check for /dev/null. */
|
||||||
dv = &m_geom[m_device];
|
dv = &m_geom[m_device];
|
||||||
|
@ -126,14 +128,24 @@ unsigned nr_req; /* length of request vector */
|
||||||
chunk = (left > RANDOM_BUF_SIZE) ? RANDOM_BUF_SIZE : left;
|
chunk = (left > RANDOM_BUF_SIZE) ? RANDOM_BUF_SIZE : left;
|
||||||
if (opcode == DEV_GATHER) {
|
if (opcode == DEV_GATHER) {
|
||||||
random_getbytes(random_buf, chunk);
|
random_getbytes(random_buf, chunk);
|
||||||
sys_vircopy(SELF, D, (vir_bytes) random_buf,
|
if(safe) {
|
||||||
proc_nr, D, user_vir, chunk);
|
sys_safecopyto(proc_nr, user_vir, vir_offset,
|
||||||
|
(vir_bytes) random_buf, chunk, D);
|
||||||
|
} else {
|
||||||
|
sys_vircopy(SELF, D, (vir_bytes) random_buf,
|
||||||
|
proc_nr, D, user_vir + vir_offset, chunk);
|
||||||
|
}
|
||||||
} else if (opcode == DEV_SCATTER) {
|
} else if (opcode == DEV_SCATTER) {
|
||||||
sys_vircopy(proc_nr, D, user_vir,
|
if(safe) {
|
||||||
|
sys_safecopyfrom(proc_nr, user_vir, vir_offset,
|
||||||
|
(vir_bytes) random_buf, chunk, D);
|
||||||
|
} else {
|
||||||
|
sys_vircopy(proc_nr, D, user_vir + vir_offset,
|
||||||
SELF, D, (vir_bytes) random_buf, chunk);
|
SELF, D, (vir_bytes) random_buf, chunk);
|
||||||
random_putbytes(random_buf, chunk);
|
}
|
||||||
|
random_putbytes(random_buf, chunk);
|
||||||
}
|
}
|
||||||
user_vir += chunk;
|
vir_offset += chunk;
|
||||||
left -= chunk;
|
left -= chunk;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -145,8 +157,7 @@ unsigned nr_req; /* length of request vector */
|
||||||
|
|
||||||
/* Book the number of bytes transferred. */
|
/* Book the number of bytes transferred. */
|
||||||
position += count;
|
position += count;
|
||||||
iov->iov_addr += count;
|
if ((iov->iov_size -= count) == 0) { iov++; nr_req--; vir_offset = 0; }
|
||||||
if ((iov->iov_size -= count) == 0) { iov++; nr_req--; }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return(OK);
|
return(OK);
|
||||||
|
@ -179,9 +190,10 @@ PRIVATE void r_init()
|
||||||
/*===========================================================================*
|
/*===========================================================================*
|
||||||
* r_ioctl *
|
* r_ioctl *
|
||||||
*===========================================================================*/
|
*===========================================================================*/
|
||||||
PRIVATE int r_ioctl(dp, m_ptr)
|
PRIVATE int r_ioctl(dp, m_ptr, safe)
|
||||||
struct driver *dp; /* pointer to driver structure */
|
struct driver *dp; /* pointer to driver structure */
|
||||||
message *m_ptr; /* pointer to control message */
|
message *m_ptr; /* pointer to control message */
|
||||||
|
int safe; /* safe i/o? */
|
||||||
{
|
{
|
||||||
struct device *dv;
|
struct device *dv;
|
||||||
if ((dv = r_prepare(m_ptr->DEVICE)) == NIL_DEV) return(ENXIO);
|
if ((dv = r_prepare(m_ptr->DEVICE)) == NIL_DEV) return(ENXIO);
|
||||||
|
@ -189,7 +201,7 @@ message *m_ptr; /* pointer to control message */
|
||||||
switch (m_ptr->REQUEST) {
|
switch (m_ptr->REQUEST) {
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return(do_diocntl(&r_dtab, m_ptr));
|
return(do_diocntl(&r_dtab, m_ptr, safe));
|
||||||
}
|
}
|
||||||
return(OK);
|
return(OK);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue