From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 18 Jun 2015 18:05:31 +0000 (+0300)
Subject: Bluetooth: Fix warning of potentially uninitialized adv_instance variable
X-Git-Tag: v4.9.8~4072^2~29^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=952497b159468477392f9b562b904da9bc76d468;p=platform%2Fkernel%2Flinux-rpi3.git

Bluetooth: Fix warning of potentially uninitialized adv_instance variable

Rework the logic of checking for a valid adv_instance for non-zero
cp->instance values. Without this change we may get (false positive)
warnings as follows:

>> net/bluetooth/mgmt.c:7294:29: warning: 'adv_instance' may be used
uninitialized in this function [-Wuninitialized]

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2fe6f3b..7998fb2 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -7280,19 +7280,15 @@ static int remove_advertising(struct sock *sk, struct hci_dev *hdev,
 {
 	struct mgmt_cp_remove_advertising *cp = data;
 	struct mgmt_rp_remove_advertising rp;
-	struct adv_info *adv_instance;
-	int err;
 	struct mgmt_pending_cmd *cmd;
 	struct hci_request req;
+	int err;
 
 	BT_DBG("%s", hdev->name);
 
 	hci_dev_lock(hdev);
 
-	if (cp->instance)
-		adv_instance = hci_find_adv_instance(hdev, cp->instance);
-
-	if (!(cp->instance == 0x00 || adv_instance)) {
+	if (cp->instance && !hci_find_adv_instance(hdev, cp->instance)) {
 		err = mgmt_cmd_status(sk, hdev->id,
 				      MGMT_OP_REMOVE_ADVERTISING,
 				      MGMT_STATUS_INVALID_PARAMS);