nfc: nci: Fix nci_core_conn_create to allowing empty destination

NCI_CORE_CONN_CREATE may not have any destination type parameter. Signed-off-by: Christophe Ricard <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
olegshaldybin · May 3, 2016 · 1883602 · 1883602
1 parent 99adc39
commit 1883602
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
@@ -610,27 +610,27 @@ 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;
 
 	cmd->destination_type = destination_type;
 	cmd->number_destination_params = number_destination_params;
-	memcpy(cmd->params, params, params_len);
 
 	data.cmd = cmd;
 
-	if (params->length > 0)
-		ndev->cur_id = params->value[DEST_SPEC_PARAMS_ID_INDEX];
-	else
+	if (params) {
+		memcpy(cmd->params, params, params_len);
+		if (params->length > 0)
+			ndev->cur_id = params->value[DEST_SPEC_PARAMS_ID_INDEX];
+		else
+			ndev->cur_id = 0;
+	} else {
 		ndev->cur_id = 0;
+	}
 
-	r = __nci_request(ndev, nci_core_conn_create_req,
-			  (unsigned long)&data,
+	r = __nci_request(ndev, nci_core_conn_create_req, (unsigned long)&data,
 			  msecs_to_jiffies(NCI_CMD_TIMEOUT));
 	kfree(cmd);
 	return r;