From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: [PATCH] NFC: nci: fix memory leak Date: Mon, 16 Nov 2015 18:27:15 +0530 Message-ID: <1447678635-11146-1-git-send-email-sudipm.mukherjee@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Sudip Mukherjee To: Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz , "David S. Miller" Return-path: Received: from mail-pa0-f54.google.com ([209.85.220.54]:34445 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbbKPM5Y (ORCPT ); Mon, 16 Nov 2015 07:57:24 -0500 Sender: netdev-owner@vger.kernel.org List-ID: In case of invalid number_destination_params we were returning error but we missed releasing cmd. Lets check for the number of parameter before allocating memory so that we don't have a memory leak. Signed-off-by: Sudip Mukherjee --- net/nfc/nci/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 10c99a5..fbb7a2b 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -610,14 +610,14 @@ int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type, struct nci_core_conn_create_cmd *cmd; struct core_conn_create_data data; + if (!number_destination_params) + return -EINVAL; + data.length = params_len + sizeof(struct nci_core_conn_create_cmd); cmd = kzalloc(data.length, GFP_KERNEL); if (!cmd) return -ENOMEM; - if (!number_destination_params) - return -EINVAL; - cmd->destination_type = destination_type; cmd->number_destination_params = number_destination_params; memcpy(cmd->params, params, params_len); -- 1.9.1