From patchwork Wed Sep 27 12:40:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 727068 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52C0BE810DA for ; Wed, 27 Sep 2023 12:40:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231700AbjI0Mku (ORCPT ); Wed, 27 Sep 2023 08:40:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbjI0Mkr (ORCPT ); Wed, 27 Sep 2023 08:40:47 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D1EC0 for ; Wed, 27 Sep 2023 05:40:46 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-32336a30d18so3145246f8f.2 for ; Wed, 27 Sep 2023 05:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695818444; x=1696423244; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=ec4SMHCZi6pgNOcJu9vO4u2B5NawDyQ3mb0ukxQO0Ss=; b=bU2htXUToSz8hn65ia9VNsTxk4v3FprhQwCbhtunzbq7HSswKNl9Hc+m8GRVTMG94V t3j6SH2FobwEfzqkD5t8A5YizJJz4gCOiYD00PycMjEZQB4Z1gOU+8ZmNd6XpSP0UyuD sCU9i2O11v5H8kHtsB8q8DQaeGDctFZtz0zCPUEBFuS4OXOPCzp/M3C6XVxx1Z1xczkB y9GxUGIudlR00DZOi0wvhnSE6ZLYqZb7xTUbTP0VyyRJfYmaZs9sSmCie1qF52+3movW O/gzufKCjAYicPH9IDnxTeBZzPklfzeljK11/FeCJhVJpJoCsyc7TVgEm0n7ozXz99t9 2xYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695818444; x=1696423244; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ec4SMHCZi6pgNOcJu9vO4u2B5NawDyQ3mb0ukxQO0Ss=; b=GwiUWoqfSpEIaRqL2kxYinWVTXDSVs5oCegB4FO7kyiiCm6GgHDisZeXW7Y0pFDKV5 qTDRX0l2cLfFzu0LcJZrUGAdEuP4/KoEqhGwX1Iz5u/RmwwtVUAlZPf67CAQX2+ZZ5j9 z2I9SqZUrHOdf4VG/JIXbkbfB98Q8VEJI/R8kSJpTQUhPgh8VgW0idWg9OtZlMmaYhSX acfHlRMrFZfBo0qSCL/9iOFQ3Lv+mb1MnADBqcWmThMIizU48ISOwvF5WkkVHw19Dmpy k6OILr4KtZlN5RZrG4ezW1UOdyhf/7prTlb+OTBvECodEi38SuLxTBO6s1rAMd8NREsO jvFA== X-Gm-Message-State: AOJu0YzF2eIe8jplWM8VsCpbiWtoZ6OJPBVRYS8cC/cHasCgJVLwXm9a i1xcNFhjpKKpGGbl62WbZ7M3Pg== X-Google-Smtp-Source: AGHT+IHEsIxfVLB7b3x8QYt1iYrP/EUgmLcuincn5ES59JkIOT+1b9kyKKfJ+E6qXMVqZqcpxMKZ+Q== X-Received: by 2002:adf:f78f:0:b0:314:1ce9:3c86 with SMTP id q15-20020adff78f000000b003141ce93c86mr1435838wrp.0.1695818444650; Wed, 27 Sep 2023 05:40:44 -0700 (PDT) Received: from localhost ([102.36.222.112]) by smtp.gmail.com with ESMTPSA id b12-20020adff90c000000b0031fb91f23e9sm16966293wrr.43.2023.09.27.05.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 05:40:44 -0700 (PDT) Date: Wed, 27 Sep 2023 15:40:41 +0300 From: Dan Carpenter To: Gregory Greenman Cc: Kalle Valo , Johannes Berg , Miri Korenblit , Shaul Triebitz , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta() Message-ID: <75e4ea09-db58-462f-bd4e-5ad4e5e5dcb5@moroto.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This error path should return -EINVAL instead of success. Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()") Signed-off-by: Dan Carpenter Acked-by: Gregory Greenman --- I copy and pasted this approach from similar code in the same patch. drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index 1464aad039e1..f2e952481ff8 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, rcu_dereference_protected(mvm_sta->link[link_id], lockdep_is_held(&mvm->mutex)); - if (WARN_ON(!link_conf || !mvm_link_sta)) + if (WARN_ON(!link_conf || !mvm_link_sta)) { + ret = -EINVAL; goto err; + } ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf, mvm_link_sta);