mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
sr100: Add NULL pointer checks
D35 handles NULL check on device release scenarios to avoid leak... Propagate_From (CR) Change-Id: I3a0ba408dafdcf6d34692b45612055f107c6be44 Signed-off-by: Kanagarathina Kalathi <kalath(CR)@motorola.com> Signed-off-by: Srihari Sathyanarayana <sriharis@motorola.com> Reviewed-on: https://gerrit.mot.com/2468580 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Vijayakumar Gn <vijaygn@motorola.com> Reviewed-by: Tao Sun <suntao2@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
parent
ab156b6336
commit
d6257bb7ac
1 changed files with 10 additions and 6 deletions
|
|
@ -1068,13 +1068,15 @@ exit_free_dev:
|
|||
if (sr100_dev->rx_buffer) {
|
||||
kfree(sr100_dev->rx_buffer);
|
||||
}
|
||||
kfree(sr100_dev);
|
||||
misc_deregister(&sr100_dev->sr100_device);
|
||||
}
|
||||
misc_deregister(&sr100_dev->sr100_device);
|
||||
err_exit0:
|
||||
mutex_destroy(&sr100_dev->sr100_access_lock);
|
||||
if (sr100_dev != NULL) kfree(sr100_dev);
|
||||
if (sr100_dev != NULL) {
|
||||
mutex_destroy(&sr100_dev->sr100_access_lock);
|
||||
}
|
||||
err_exit:
|
||||
if (sr100_dev != NULL) kfree(sr100_dev);
|
||||
SR100_DBG_MSG("ERROR: Exit : %s ret %d\n", __FUNCTION__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1104,9 +1106,11 @@ static int sr100_remove(struct spi_device* spi) {
|
|||
gpio_free(sr100_dev->vbat_3v6_gpio);
|
||||
#endif
|
||||
misc_deregister(&sr100_dev->sr100_device);
|
||||
if (sr100_dev->tx_buffer != NULL) kfree(sr100_dev->tx_buffer);
|
||||
if (sr100_dev->rx_buffer != NULL) kfree(sr100_dev->rx_buffer);
|
||||
if (sr100_dev != NULL) kfree(sr100_dev);
|
||||
if (sr100_dev != NULL) {
|
||||
if (sr100_dev->tx_buffer != NULL) kfree(sr100_dev->tx_buffer);
|
||||
if (sr100_dev->rx_buffer != NULL) kfree(sr100_dev->rx_buffer);
|
||||
if (sr100_dev != NULL) kfree(sr100_dev);
|
||||
}
|
||||
SR100_DBG_MSG("Exit : %s\n", __FUNCTION__);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue