Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp102279rwe; Fri, 26 Aug 2022 01:16:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR7GJCu19UB77xpT/gOuIKMTJz3XpT6d/68E6RvMC5mwwq/SzSo66L0AcTkU+LOTrYBMR1Gm X-Received: by 2002:a17:902:c401:b0:16f:b59:85a7 with SMTP id k1-20020a170902c40100b0016f0b5985a7mr2641061plk.115.1661501804591; Fri, 26 Aug 2022 01:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661501804; cv=none; d=google.com; s=arc-20160816; b=CRM0Gn/Rvk8EQaRrj6v/vUywjtpWbB/N43fbzDZE64wbb90cA+ubhlyvLUSkNkHaB3 QzsJwR37w+Y/0WilRnPl3IH4/5g8NFbDAAjbyFhiraXQ8M4oF8hssL0LeE2AgyGM/rmP fon8IarTeJ7Z6yOuRu588KPo3KzF4ErXUbp+h3eLAgkAm+CtaVPugOXzuZPHPH6Sm8+2 Nf8WLFUS+7LrchmBSLjUzOSblilXfsiFRc7fw+KpcgeCX9a22Qck5+8F/BsU0z8+xRCX bwiB+Z/vRSB5O9oFhah+J2U4zDVdB1O3uby0fEJZ8KpjRc3LZ7gx2JJJ/mzPfySvTGek 0dxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=i+tBtsUnG9uTzd3PBa2mOwDV2iTv9U71K+F+7Z0VsWw=; b=G2eht44AaKeMkxcZ1CKoLHel6cdtcwaAJ98nys5nYXvMn8vUqVp0R6gC/Pi3AJTHOq eSLmqjIFNL2Ivh7c5YgN2E5xDr8UrJ0/RS5c0k3pGUdMY0nE/zvZ6zK+8HU9c3dX3IBK cGbqUWfYHD4iObYGdytZMfkISMq4WuwK8vnfBUoWBzbqKYAKGpUf8PDWUlBdIVM19lci bJHCZxRmDJq6+ps6ozjXV7A3zxK7nvUqF+t0dSCatlbbKz5hZ+8/ki1EWuKfyvECnzXj e4KoOOZVLsfdOhxyJ0c/eX3GSdJrew8XXRlwnQuj0NS2OblewcEOnSliPuPZ6pbt7M4h ZIjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t189-20020a6381c6000000b0041cda12f984si1158561pgd.20.2022.08.26.01.16.33; Fri, 26 Aug 2022 01:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245304AbiHZH0T (ORCPT + 99 others); Fri, 26 Aug 2022 03:26:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245276AbiHZH0I (ORCPT ); Fri, 26 Aug 2022 03:26:08 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5DB44BD04 for ; Fri, 26 Aug 2022 00:26:01 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MDWW63cczz19S70; Fri, 26 Aug 2022 15:22:26 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 26 Aug 2022 15:25:58 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 26 Aug 2022 15:25:58 +0800 From: Yang Yingliang To: CC: , , , Subject: [PATCH -next 3/3] fail_function: fix wrong use of fei_attr_remove() Date: Fri, 26 Aug 2022 15:33:37 +0800 Message-ID: <20220826073337.2085798-3-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220826073337.2085798-1-yangyingliang@huawei.com> References: <20220826073337.2085798-1-yangyingliang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org If register_kprobe() fails, the new attr is not added to the list yet, so it should call fei_attr_free() intstead. Fixes: 4b1a29a7f542 ("error-injection: Support fault injection framework") Signed-off-by: Yang Yingliang --- kernel/fail_function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/fail_function.c b/kernel/fail_function.c index 893e8f9a9118..a7ccd2930c5f 100644 --- a/kernel/fail_function.c +++ b/kernel/fail_function.c @@ -295,7 +295,7 @@ static ssize_t fei_write(struct file *file, const char __user *buffer, ret = register_kprobe(&attr->kp); if (ret) { - fei_attr_remove(attr); + fei_attr_free(attr); goto out; } fei_debugfs_add_attr(attr); -- 2.25.1