Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 27 Jul 2022 15:08:56 +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 1/2] Bluetooth: ISO: unlock on error path in
 iso_sock_setsockopt()
Message-ID: <YuEq2Aey0VOrxPB+@kili>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UnLxBb4wqDqrswIuOo6DxJNwUqilOWu4Sb1caDO7kds2+nsoob0xXt1WTSwh?=
 =?us-ascii?Q?4ZJy+wUlvZyLNpD4FV5+LGz/jYS4ZnlkX/rjwWvwD+3rEkWSW1EUvbjiuhlJ?=
 =?us-ascii?Q?q8zA8cdnNBHLqs+t/c9jX0ZEBckCk07Pd7lRfHuNBdtCs1LgMOMFXBL3JPKC?=
 =?us-ascii?Q?UQFjk8XA43tzVV7GumvOhatI/4f6fngNT/jmEN0vLXaCHMo0a5kApfgICrmd?=
 =?us-ascii?Q?RtdXChGnIf9k6kcV+7ILWQ9KZYB75Rraz4yk5CGVVkSamtu1+Dcu2Me3MYnf?=
 =?us-ascii?Q?1+r7qJfJ4Q9DjIrAtXW4Iy0pJ9HaxmhdCtk24A0e77csTC+94ecbqOPj4lFE?=
 =?us-ascii?Q?BEqFTK195Gh6rULuHftJmPEJGsluLS8fFvlBcn4fI71xlhtehp7/zdktioqU?=
 =?us-ascii?Q?2MMEX8huey+t8rzQlk5qTJX4h5dYIHAZJD6x/avmcHR2Tb6GZAxm0V76n/5z?=
 =?us-ascii?Q?t0FNvdjU+c2PCgnpbux+Rnfhe04CHfptJJEMl9aT9TLs4JquQwpqmhM+a1M2?=
 =?us-ascii?Q?25pMiwJguErlm5rxlMV2jVMlfYrxnbxTaNchwYLyOni4Ug9Pw/NKhELRhKBc?=
 =?us-ascii?Q?sV93vAc30mjPv1MNwznQF2uXuyJJPB9azmmkr3Es3poJttwfRo/jpXnyjjuS?=
 =?us-ascii?Q?/ZX3T5TBMDwxMaWxAgGRTJ8G8oOxU6CFvVSIz/Srjwhie5AglASbpOPweJUA?=
 =?us-ascii?Q?Oak+1MkKMWroYlGGle/4Ql+gxk9PeEIVjvQgc20q5NJMiaLQhD6gyw1BDDdC?=
 =?us-ascii?Q?TPBHRhLxuwPc5UMb4H5yVbR7TwPfxATZkeXFfEUDB/vpcg0S4SGo7nOdkMCC?=
 =?us-ascii?Q?3DJKBhmBNJvomsxCu9doDmGYpnRAj40PwFqR7CpWP/HQFo0/hE88Ehpv6umx?=
 =?us-ascii?Q?Q2Es5D8XUHSLw6qQnShQhDqEtp5hYTaXO8r4qIDnaTczzqw7uHXonsMyMlZs?=
 =?us-ascii?Q?lr97J7Stcn6SKLMqWpE9tzkNjhBWy2QIseCNzEtryaEcBA/LZy/EXiYNw0sT?=
 =?us-ascii?Q?AqguFpiR6l4hFQmJvoqVEVk30KAZgqWgdarhAQ0qzEEaTr9NbfG5l3U+TPVQ?=
 =?us-ascii?Q?eMpOY+oqISaC+fAuXMb7WQc6ejqSZLnSY0DG+CkRib3iEnnu/mCgIV953NW8?=
 =?us-ascii?Q?9/LS/5MF/7S2AY04bTLhBGCMdBMHC/qjxiPToGR/trRAkHRzIBDSx/8pwmHC?=
 =?us-ascii?Q?Q7KZ/aHXWRaQNsq0BkDZ0nAPbXfBP4pPptbd4YOMzFCjMBdgInlJNZxe+nT6?=
 =?us-ascii?Q?4BciHYtKYdZkyVwVZpvPDIwwlryMpuaIkbZFs9/IfDdyo7biX1OWcsKjmU/p?=
 =?us-ascii?Q?5FurY/1KRv9evSmiN++DjA8EO436VKyKFDzAeo/dLF/nDmzL0tEuGJ3RW5J2?=
 =?us-ascii?Q?noGlyMJwC2kaQut39ty7+MHi9+AeD7qGHHaEZGsxJ3OqgyGcicC0uO1P198A?=
 =?us-ascii?Q?DowHTdU/UuWwFjfvNSUqLvXnFHa3wCrsWj2g8IUwAeI67LSC6uEYm79yDWKg?=
 =?us-ascii?Q?vy7HR9VobE2aeG4VIT4W8YZEb0r83Qa6OEcqS0MvSAyRTkGr+q74XwuUbOFI?=
 =?us-ascii?Q?gY0WVhDzSfcLN0b8qf0FyT4H5djbM8Lb9Lp4zGGfuoOWGOyixA1VC1YxoaWF?=
 =?us-ascii?Q?TA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 15e1f8b3-2b1f-49c6-378c-08da6fc8cd71
X-MS-Exchange-CrossTenant-AuthSource: CY4PR1001MB2358.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2022 12:09:05.8644
 (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: 7DoOxJ0rgX5tmaHtSvoBIYWSmgUcHSAMtQK3BpTyJgkUTucjzmPUR9RNgi+9knJudi2lg95z1efE65yWOnSEpkrdzkg8vlS8rqapLfJOOuY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1001MB2194
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-27_02,2022-07-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 bulkscore=0
 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207270050
X-Proofpoint-ORIG-GUID: _z4g82jdzQ7Mq4MTSoxCyZjMMoRgKd83
X-Proofpoint-GUID: _z4g82jdzQ7Mq4MTSoxCyZjMMoRgKd83
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Call release_sock(sk); before returning on this error path.

Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 net/bluetooth/iso.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index ff09c353e64e..19d003727b50 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -1177,8 +1177,10 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
 		}
 
 		len = min_t(unsigned int, sizeof(qos), optlen);
-		if (len != sizeof(qos))
-			return -EINVAL;
+		if (len != sizeof(qos)) {
+			err = -EINVAL;
+			break;
+		}
 
 		memset(&qos, 0, sizeof(qos));
 
-- 
2.35.1