[PATCH] char: ip2: check put_user() result
in [Kernel]
|
Prev: [PATCH] scsi: mac_scsi: check scsi_register() result
Next: [PATCH] scsi: ch: check put_user() result
From: Kulikov Vasiliy on 29 Jul 2010 12:00 put_user()/copy_to_user() may fail, if so return -EFAULT. Signed-off-by: Kulikov Vasiliy <segooon(a)gmail.com> --- drivers/char/ip2/ip2main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 07f3ea3..3f70a05 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c @@ -2813,9 +2813,9 @@ DumpTraceBuffer ( char __user *pData, int count ) return -EIO; } rc = put_user(tracewrap, pIndex ); - rc = put_user(TRACEMAX, ++pIndex ); - rc = put_user(tracestrip, ++pIndex ); - rc = put_user(tracestuff, ++pIndex ); + rc |= put_user(TRACEMAX, ++pIndex); + rc |= put_user(tracestrip, ++pIndex); + rc |= put_user(tracestuff, ++pIndex); pData += sizeof(int) * 6; count -= sizeof(int) * 6; @@ -2828,7 +2828,7 @@ DumpTraceBuffer ( char __user *pData, int count ) } chunk = TRACEMAX - tracestrip; if ( dumpcount > chunk ) { - rc = copy_to_user(pData, &tracebuf[tracestrip], + rc |= copy_to_user(pData, &tracebuf[tracestrip], chunk * sizeof(tracebuf[0]) ); pData += chunk * sizeof(tracebuf[0]); tracestrip = 0; @@ -2836,15 +2836,15 @@ DumpTraceBuffer ( char __user *pData, int count ) } else { chunk = dumpcount; } - rc = copy_to_user(pData, &tracebuf[tracestrip], + rc |= copy_to_user(pData, &tracebuf[tracestrip], chunk * sizeof(tracebuf[0]) ); tracestrip += chunk; tracewrap = 0; - rc = put_user(tracestrip, ++pIndex ); - rc = put_user(tracestuff, ++pIndex ); + rc |= put_user(tracestrip, ++pIndex); + rc |= put_user(tracestuff, ++pIndex); - return dumpcount; + return rc ? -EFAULT : dumpcount; #else return 0; #endif -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |