i2Output always takes kernel data now
PATCH 1/1 i2Output always takes kernel data now
Signed-off-by Al Viro <[email protected]>
--- drivers/char/ip2/i2lib.c | 11 +++-------- drivers/char/ip2/i2lib.h | 2 +- drivers/char/ip2/ip2main.c | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-)
drivers/char/ip2/i2lib.c +3 -8
@@ -1007,7 +1007,7 @@ #endif// applications that one cannot break out of. //****************************************************************************** static int -i2Output (i2ChanStrPtr pCh,const char *pSource,int count,int user ) +i2Output (i2ChanStrPtr pCh,const char *pSource,int count) {i2eBordStrPtr pB;unsigned char *pInsert;
@@ -1020,7 +1020,7 @@ i2Output(i2ChanStrPtr pCh, const char *pint bailout =10 ; -ip2trace (CHANN ,ITRC_OUTPUT ,ITRC_ENTER ,2 , count, user ); +ip2trace (CHANN ,ITRC_OUTPUT ,ITRC_ENTER ,2 , count,0 );// Ensure channel structure seems real if ( !i2Validate ( pCh ) )
@@ -1087,12 +1087,7 @@ i2Output(i2ChanStrPtr pCh, const char *pDATA_COUNT_OF (pInsert) = amountToMove;// Move the data -if ( user ) { - rc =copy_from_user ((char *)(DATA_OF (pInsert)), pSource, - amountToMove ); - }else { -memcpy ( (char *)(DATA_OF (pInsert)), pSource, amountToMove ); - } +memcpy ( (char *)(DATA_OF (pInsert)), pSource, amountToMove );// Adjust pointers and indices pSource += amountToMove; pCh->Obuf_char_count += amountToMove;
drivers/char/ip2/i2lib.h +1 -1
@@ -332,7 +332,7 @@ static int i2QueueCommands(int, i2ChanSstatic int i2GetStatus (i2ChanStrPtr ,int );static int i2Input (i2ChanStrPtr );static int i2InputFlush (i2ChanStrPtr ); -static int i2Output (i2ChanStrPtr ,const char *,int ,int ); +static int i2Output (i2ChanStrPtr ,const char *,int );static int i2OutputFree (i2ChanStrPtr );static int i2ServiceBoard (i2eBordStrPtr );static void i2DrainOutput (i2ChanStrPtr ,int );
drivers/char/ip2/ip2main.c +2 -2
@@ -1704,7 +1704,7 @@ ip2_write( PTTY tty, const unsigned char/* This is the actual move bit. Make sure it does what we need!!!!! */ WRITE_LOCK_IRQSAVE (&pCh->Pbuf_spinlock,flags); - bytesSent =i2Output ( pCh, pData, count,0 ); + bytesSent =i2Output ( pCh, pData, count);WRITE_UNLOCK_IRQRESTORE (&pCh->Pbuf_spinlock,flags);ip2trace (CHANN ,ITRC_WRITE ,ITRC_RETURN ,1 , bytesSent );
@@ -1764,7 +1764,7 @@ ip2_flush_chars( PTTY tty )// // We may need to restart i2Output if it does not fullfill this request // - strip =i2Output ( pCh, pCh->Pbuf, pCh->Pbuf_stuff,0 ); + strip =i2Output ( pCh, pCh->Pbuf, pCh->Pbuf_stuff);if ( strip != pCh->Pbuf_stuff ) {memmove ( pCh->Pbuf, &pCh->Pbuf[strip], pCh->Pbuf_stuff - strip ); }
Signature · 1 line
1.4.2.GIT