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

usb_serial: don't allow Service() on a closed device.

Browse Source 
- In Service, check that the device is open.
- In Close, clear dangling pointers to more easily spot problems and
avoid risk of accessing freed memory.

Change-Id: I970c4b8b8ec14db448388f74fc275634801c359a
Reviewed-on: https://review.haiku-os.org/c/1551
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Adrien Destugues
2019-07-01 03:01:07 +00:00
committed by waddlesplash
parent 865a165f1c
commit e399a8832d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/ports/usb_serial/SerialDevice.cpp
+8 -1
View File
@@ -212,6 +212,9 @@ SerialDevice::SetModes(struct termios *tios)
bool bool
SerialDevice::Service(struct tty *tty, uint32 op, void *buffer, size_t length) SerialDevice::Service(struct tty *tty, uint32 op, void *buffer, size_t length)
{ {
if (!fDeviceOpen)
return false;
if (tty != fMasterTTY) if (tty != fMasterTTY)
return false; return false;
@@ -453,6 +456,7 @@ SerialDevice::Close()
fStopThreads = true; fStopThreads = true;
fInputStopped = false; fInputStopped = false;
fDeviceOpen = false;
if (!fDeviceRemoved) { if (!fDeviceRemoved) {
gUSBModule->cancel_queued_transfers(fReadPipe); gUSBModule->cancel_queued_transfers(fReadPipe);
@@ -473,7 +477,10 @@ SerialDevice::Close()
gTTYModule->tty_destroy(fMasterTTY); gTTYModule->tty_destroy(fMasterTTY);
gTTYModule->tty_destroy(fSlaveTTY); gTTYModule->tty_destroy(fSlaveTTY);
fDeviceOpen = false; fMasterTTY = NULL;
fSlaveTTY = NULL;
fSystemTTYCookie = NULL;
fDeviceTTYCookie = NULL;
return B_OK; return B_OK;
} }