Unverified Commit 4bb88ba3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5556 NFC: nci: fix memory leak in nci_allocate_device 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UVUKEFYXGFJFUUKAIZFD6WAU5ZYW7DAL/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9BHQ7 
 
Link:https://gitee.com/openeuler/kernel/pulls/5556

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 6b5a50d2 60bdd92e

include/net/nfc/nci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len, 
		      struct sk_buff **resp);



struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev);

void nci_hci_deallocate(struct nci_dev *ndev);

int nci_hci_send_event(struct nci_dev *ndev, u8 gate, u8 event,

		       const u8 *param, size_t param_len);

int nci_hci_send_cmd(struct nci_dev *ndev, u8 gate,

net/nfc/nci/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ EXPORT_SYMBOL(nci_allocate_device); 
void nci_free_device(struct nci_dev *ndev)

{

	nfc_free_device(ndev->nfc_dev);

	nci_hci_deallocate(ndev);

	kfree(ndev);

}

EXPORT_SYMBOL(nci_free_device);

net/nfc/nci/hci.c

+5 −0
Original line number Diff line number Diff line
@@ -807,3 +807,8 @@ struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev) 


	return hdev;

}



void nci_hci_deallocate(struct nci_dev *ndev)

{

	kfree(ndev->hci_dev);

}