History

i2c: smbus: kill memory leak on emulated and failed DMA SMBus xfers

If DMA safe memory was allocated, but the subsequent I2C transfer fails the memory is leaked. Plug this leak.

Peter Rosin committed 8 years ago

Commit 9aa61361 parent 2173ed01 file · +9 −5Browse files

Unified · Split

drivers/i2c/i2c-core-smbus.c+9−5
@@ -465,15 +465,18 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr, · 464 unmodified lines
465465
466466 status = i2c_transfer(adapter, msg, num);
467467 if (status < 0)
468− return status;
469− if (status != num)
470− return -EIO;
468+ goto cleanup;
469+ if (status != num) {
470+ status = -EIO;
471+ goto cleanup;
472+ }
473+ status = 0;
471474
472475 /* Check PEC if last message is a read */
473476 if (i && (msg[num-1].flags & I2C_M_RD)) {
474477 status = i2c_smbus_check_pec(partial_pec, &msg[num-1]);
475478 if (status < 0)
476− return status;
479+ goto cleanup;
477480 }
478481
479482 if (read_write == I2C_SMBUS_READ)
@@ -499,12 +502,13 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr, · 19 unmodified lines
499502 break;
500503 }
501504
505+cleanup:
502506 if (msg[0].flags & I2C_M_DMA_SAFE)
503507 kfree(msg[0].buf);
504508 if (msg[1].flags & I2C_M_DMA_SAFE)
505509 kfree(msg[1].buf);
506510
507− return 0;
511+ return status;
508512 }
509513
510514 /**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t