Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 29 Aug 2022 11:41:41 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Johannes Berg <johannes@sipsolutions.net>
Cc:     Ilan Peer <ilan.peer@intel.com>, linux-wireless@vger.kernel.org,
        kernel-janitors@vger.kernel.org
Subject: [PATCH] wifi: mac80211: Unlock on error path in ieee80211_key_link()
Message-ID: <Ywx7xR590F6lUA4l@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?WaCdfOhkl3HUcbb8QduJYxrKzhft6arheaQv/spBP0Pwexqk4qPVpBfRE9tG?=
 =?us-ascii?Q?5n6FPNkhmie0be7TZ9+MECccOnyd9bi4RNZNegiQ/qPMfo9zSGVyOhGahTdW?=
 =?us-ascii?Q?fw71Imqk/UVSGqyDpAyiceIXfqQBAfW8gdojG8aN3alHFdRcRrz1uAkYnRcR?=
 =?us-ascii?Q?mwSDt/ym5ItdOGuRwh7wLE7Mi5yyqwoqcVetHas4KsFfNaM7aCfbwfCm4xyO?=
 =?us-ascii?Q?6JBofky1WKV81zMFqCrq2K9qfeqYPqgmCpwHZPQwucgwkEX7DH+JqsXdFnC/?=
 =?us-ascii?Q?auomhU4cvzbqqorQqDCt5oUmtQMS4iesQic57lm6XeTJ8cmhjaCFOgcfZTav?=
 =?us-ascii?Q?LtoiroM7maMlq0Oez9oawDHQYz8c/7A4wgp9lhFn7Arizak2LquX/oZY6TAI?=
 =?us-ascii?Q?5ElKVxi/5plpDs1OTBe7Em2bx7bJqrscPA0lf3TvicnABe5BLtm4h8sxWSjL?=
 =?us-ascii?Q?wpCLEUt6hsCAMSVtjroNU4MJg7m8UYnV1pJcjWc3ly2j0gVq223AOBomdJ7f?=
 =?us-ascii?Q?qfS4B9UfSNqUlyEfqKKZls5shJxhXbWb/hg9vly0vyzcy8smCm0uIptWF5cP?=
 =?us-ascii?Q?bczeQgY/xzp7JaCu89rDIMPvlnIQrC7/6osWn6ciYf7rhogx5yNRff+SpM7A?=
 =?us-ascii?Q?ExUkWbNWwGESyrCPxFQ+zGaQIE8wSNHEkNMdyuhTZ1MkRQBgwskxRumErNbL?=
 =?us-ascii?Q?WiTZhaXSTyHbeZWjnCtxgyaSxOcPEvyt3vHy9f4c9WdOQag73jMa0tYKn+/K?=
 =?us-ascii?Q?bQRb7L/EcY/2fIk/Rxc2/M5yut/m40ydK4gI9HoI/jE8GzcFNUdqrZe6M4nx?=
 =?us-ascii?Q?ExDO0/2FxU88ior6NWJ9pD3C5r5LEgJKSkv24aoVmSo9uethy3dQax9voMtu?=
 =?us-ascii?Q?DuXUArtS815Te3cUdlDfJe6N+famPgMwZnRifXhgbmsXuURYiyDXhmZPi4+K?=
 =?us-ascii?Q?pyzdT9Q7n99xW82a0pSwEids78d3krxjj7Zaz1vHc/u0AYCz6Eb1OJKrJRgj?=
 =?us-ascii?Q?b6tM+BVJJcgbTn3b9f9TD9LL7C2kCiia3evUkYW6AUNayGOBVlmGQgG/xkx1?=
 =?us-ascii?Q?GQlRH77p2+S4r1f2K0aS9IRznrcdIg5+/rh/68frXSRvAU7JrwRF8V2qteqs?=
 =?us-ascii?Q?y9kwZnx6nEqPrJ2m5JGvxMb11/J8x72DOIAR+47fVS8xAyk2OEYJiPpQ/aVl?=
 =?us-ascii?Q?j8AlgwVpS5OubNH/okIe0cNuEWRM6flePheuMV8A35a3sPrCFNw56yTft9mx?=
 =?us-ascii?Q?yXpimEXb4eE8/7t1vhDjxs94WL0CZt4EQQwNgh4tkDcBR/rrg47y+DJ/4o6r?=
 =?us-ascii?Q?tzSkwMo6vK8rfpfekesoxyYsR3r9Dt10AwmMDslsER3GTQkAxvQ96cGUmg25?=
 =?us-ascii?Q?tiBK5r7WWyHyUSAJRObN90X/oxV2g+DvJu3CWIAmFJMhjrszCN3zpBf0TdCc?=
 =?us-ascii?Q?VqppoOyfcGVMO24XjbLPvMc881Djlk8tlPC5gyCbeQG9+a7FKB+NLe5LZLKH?=
 =?us-ascii?Q?OTa1diInMffCWZjUcIjL3iE6A3SPUjLLZAhB75KwycZsCWkJbVo9L1Oy4fT1?=
 =?us-ascii?Q?+4cnjnT+AqQcsnNkOiNUQTXS6iK7fJjfMlWQZSwQ0AiaSy31DnuoOS9cJSTl?=
 =?us-ascii?Q?yw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6c83961d-0034-4ebb-f6ce-08da899a51a4
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 08:41:51.5330
 (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: kZ/v5RjWsizl5ZvQQjmve+QW9R4Vxz27TdD9R8tCvj4iBMbHa32CvF0Hph4xvYLfLUWX04ZnhSACSNX50ZuAQFJgEk5E7faDjHyxitMCznk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4962
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-29_04,2022-08-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 spamscore=0
 adultscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208290042
X-Proofpoint-ORIG-GUID: Wxd-_88ypm9_UNYado1Qw1fPBjD0IZjb
X-Proofpoint-GUID: Wxd-_88ypm9_UNYado1Qw1fPBjD0IZjb
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,T_SCC_BODY_TEXT_LINE
        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-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Unlock before returning on this error path.

Fixes: ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 net/mac80211/key.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 86aac87e0211..d89ec93b243b 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -865,8 +865,10 @@ int ieee80211_key_link(struct ieee80211_key *key,
 		if (link_id >= 0) {
 			link_sta = rcu_dereference_protected(sta->link[link_id],
 							     lockdep_is_held(&sta->local->sta_mtx));
-			if (!link_sta)
-				return -ENOLINK;
+			if (!link_sta) {
+				ret = -ENOLINK;
+				goto out;
+			}
 		}
 
 		old_key = key_mtx_dereference(sdata->local, link_sta->gtk[idx]);
-- 
2.35.1