i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_asix: takes into account that received data is padded to 16bit

Browse Source 
* also checks whether too little data is received.
This commit is contained in:
Jérôme Duval
2013-07-25 19:18:50 +02:00
parent 0994532db4
commit 143cfee84c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/usb_asix/ASIXDevice.cpp
+6 -2
View File
@@ -226,9 +226,14 @@ ASIXDevice::Read(uint8 *buffer, size_t *numBytes)
*numBytes = header.Length(); *numBytes = header.Length();
if (fActualLengthRead - sizeof(TRXHeader) > header.Length()) { // the device pushes packets 16bit aligned
if (fActualLengthRead - sizeof(TRXHeader) > header.Length()
+ (header.Length() % 2)) {
TRACE_ALWAYS("MISMATCH of the frame length: hdr %d; received:%d\n", TRACE_ALWAYS("MISMATCH of the frame length: hdr %d; received:%d\n",
header.Length(), fActualLengthRead - sizeof(TRXHeader)); header.Length(), fActualLengthRead - sizeof(TRXHeader));
} else if (fActualLengthRead - sizeof(TRXHeader) < header.Length()) {
TRACE_ALWAYS("Error: received too little data: hdr %d; received:%d\n",
header.Length(), fActualLengthRead - sizeof(TRXHeader));
} }
} else { } else {
@@ -750,4 +755,3 @@ ASIXDevice::_NotifyCallback(void *cookie, int32 status, void *data,
device->fNotifyBufferLength, _NotifyCallback, device); device->fNotifyBufferLength, _NotifyCallback, device);
atomic_add(&device->fInsideNotify, -1); atomic_add(&device->fInsideNotify, -1);
} }