Date:   Tue, 11 Jan 2022 10:23:19 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Marcel Holtmann <marcel@holtmann.org>,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc:     Johan Hedberg <johan.hedberg@gmail.com>,
        linux-bluetooth@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] Bluetooth: hci_sync: unlock on error in
 hci_inquiry_result_with_rssi_evt()
Message-ID: <20220111072319.GH11243@kili>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DVJvKobRSLBKL3X+Yt3L4w+O4MgJqmn8Nv4RQdUdCWDs65tAYfzYDRh9okEw?=
 =?us-ascii?Q?7/P3pwEllwrcImVsty3lNzNU2ShoTxqYnm2FapGkPKoOLH9paP39Q5xebrim?=
 =?us-ascii?Q?+RZU2QRJ3cZoQlGG8kHBpgrcd7gkyZwU/MS019J/b/JiQr+j3+VtjqoUVAZG?=
 =?us-ascii?Q?d4YAhmlJ1+YonXdeb1R2icjEas2OZLx5JjLOP4FxjrpwE9HwseZe0IgTbR7q?=
 =?us-ascii?Q?wytOoHhpIDAjSC3V8egNxZ7srZcnyI0UgeJOJTZBanhTxlyfR4O0vKvbHnND?=
 =?us-ascii?Q?6q40SvUTF9fOXWvYqyMqYDjlygoBlFw8kHHiPpbLOuuAJUt76eNUAKZRZPxc?=
 =?us-ascii?Q?awWBPKEO3dRkOOM+nTiqhzCm5ZQPPfLA4PMEs0xlrzmvl1/2vqI8E8aYgkje?=
 =?us-ascii?Q?CCe5mbpUGRqCCTzGK+Cw8F62kEQeMYHwfsW2Ls2eC/E6JvFxwKOqs5QP7+sX?=
 =?us-ascii?Q?D49EfCU3II885OhW/7o2frvEaJ/6hIhmIOMvIf3xNwQ2heWTfhnH7GQSaVo7?=
 =?us-ascii?Q?ULa+RI9uU0WCGAFNevyp/w5J0cZ11r08aJWtebIh3+xLnDXm3jBHwcOLv+HT?=
 =?us-ascii?Q?b+rrC0KaNf87dsptJvXDsPe1z0ulTR0vFpGi4pqsU9+wMVpk4YmTkNO1wtxE?=
 =?us-ascii?Q?r5QZA1PHzdEAQZr7708SV7rkzFRaQvE7kHtvYT30tVC2wGpmpAD0UjjUj48g?=
 =?us-ascii?Q?zEpx3lNLaDXU0Qs6IV0D2VqhZxMXEm3wXDYqqpvrY9vsQ6VWBB0NkXmcs2+W?=
 =?us-ascii?Q?CxrJNPtW4KFH8cVgDLe1RWiemZ/k4lqBPcEs1qw5Fm7tgEH7X2wmRGtlR9jz?=
 =?us-ascii?Q?RIoCxWyXwviH2eSfI9erlluwZGuCpNeOdPl99Fwv7gDLNKi7e/q7gPdOAJxk?=
 =?us-ascii?Q?rLDwSB/ei1rj78daEzqfn/078YteHp4lkpY1u+CPOzKhi8dfLp+ENAx8AvAk?=
 =?us-ascii?Q?/4EAk3VeRFlJMnlQtSwk8sQuHUPUa2K9PEx7hklUnjqBCEsrXWTuCSPeXx+q?=
 =?us-ascii?Q?KvIBzz9KM7paREywv12ksMxzub7rZSvLDAJ6G515BulxTZoXHTZq5QptN+/Q?=
 =?us-ascii?Q?yB6Ow8SPZ+T1JeOzjZP6T+cPTjCAYYJQ+TSwomQCGP91ptJRvvZcemh9UKhK?=
 =?us-ascii?Q?bkP6lNPnaU1sBmVmjduc7Qb/3cKLzvg1SqcVii4qLw4MZsgxx/PBetI92hsv?=
 =?us-ascii?Q?lPFrWjDhvoZXFsdJMbM/lGFeR5lNJoZwbj16SsPewYOewJN8J5zW+D7ce+3g?=
 =?us-ascii?Q?Xr1WHACwh+k6744GJqOSbleZT1Xg3X/hK4/7WP14L4Zs5Rqto/QW9zkSaMd+?=
 =?us-ascii?Q?n9bbqfhWPl+tE1VUEh2G+0fMuiFegHD0JCDdf81sn+A4a2kDYa5PvGfGP4k/?=
 =?us-ascii?Q?YuOgUMNHexacljBk27ESf9LSIC5oxW4gIyCzj0awwm118Kf1eab54lEtf1DN?=
 =?us-ascii?Q?C0VRY82I79uk3LupdeDdUdgvFKZT6pc0cTsibyCt3n2dQhlFm7R6zIpfBs0c?=
 =?us-ascii?Q?MrmGVWlq4W6lmwxfUPA7sZlXBhXh/D6Q7bc0oPrsAYD/fANwVzEkScSjdR6L?=
 =?us-ascii?Q?y+Gm2v59GI30THSAtipVAdLesQi7B+wIz96H+cDTBnjqKAh2R6Ijm42NdyAP?=
 =?us-ascii?Q?5ooMy/eefCFdkjMFdzCPJDVp/nD+ODmEg07JoUkx+j+nvMvVSx4EE7dn7Aqs?=
 =?us-ascii?Q?ffNHW3Ft8VQy46+F3zGeVzIaFQ4=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b5f1fc78-0f01-4471-7a42-08d9d4d34427
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 07:23:29.8917
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LYvJgRQ5TroF26nKllvi3Ldym/RMJgw/7NrnHPuz5DhHt4eZ0XNvqQA7cSf2dvu6vogJhnP6HuunUc+XEnTHUbWyxx6VnGAxl2eNak/vAmo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2159
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10223 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 adultscore=0
 suspectscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201110039
X-Proofpoint-GUID: eBVChr4cozJx_-JEDTT2nhosqhKLVNHx
X-Proofpoint-ORIG-GUID: eBVChr4cozJx_-JEDTT2nhosqhKLVNHx
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Add unlocks to two error paths in hci_inquiry_result_with_rssi_evt().

Fixes: fee645033e2c ("Bluetooth: hci_event: Use skb_pull_data when processing inquiry results")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 net/bluetooth/hci_event.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f1082b7c0218..e6c75cb1c7fe 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4536,7 +4536,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 			if (!info) {
 				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
-				return;
+				goto unlock;
 			}
 
 			bacpy(&data.bdaddr, &info->bdaddr);
@@ -4566,7 +4566,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 			if (!info) {
 				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
-				return;
+				goto unlock;
 			}
 
 			bacpy(&data.bdaddr, &info->bdaddr);
@@ -4588,7 +4588,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
 		bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
 			   HCI_EV_INQUIRY_RESULT_WITH_RSSI);
 	}
-
+unlock:
 	hci_dev_unlock(hdev);
 }
 
-- 
2.20.1