From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77309C2D0E4 for ; Sun, 15 Nov 2020 18:02:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEE54222D5 for ; Sun, 15 Nov 2020 18:02:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="hy7EnfSy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727519AbgKOSBY (ORCPT ); Sun, 15 Nov 2020 13:01:24 -0500 Received: from m12-12.163.com ([220.181.12.12]:51636 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727000AbgKOSBX (ORCPT ); Sun, 15 Nov 2020 13:01:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=6MubN k2IDlcXLKxODBPdt2LcfZmGAlZrFRKaa1VWLxI=; b=hy7EnfSy+TPcFpr3dYVRo //U3rW9X5SAlf19MmGaY6nT4/pZlXnr3gPn02fVIgxvE+fIYYr7+/tXNiNi+HJxZ PxQbcot5jbuh2bCl81/KGC6damj0LkJOY9tfEx7/JcQFMgc7kV2On2bahY+BYXC5 k8TnqFy+qP8H73KIZhjAj0= Received: from localhost (unknown [101.86.213.176]) by smtp8 (Coremail) with SMTP id DMCowABnM9nWbLFfvZyMBw--.838S2; Mon, 16 Nov 2020 02:00:54 +0800 (CST) Date: Mon, 16 Nov 2020 02:00:54 +0800 From: Hui Su To: christian.brauner@ubuntu.com, serge@hallyn.com, avagin@openvz.org, 0x7f454c46@gmail.com, linux-kernel@vger.kernel.org Cc: sh_def@163.com Subject: [PATCH] nsproxy: use put_nsproxy() in switch_task_namespaces() Message-ID: <20201115180054.GA371317@rlk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CM-TRANSID: DMCowABnM9nWbLFfvZyMBw--.838S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7GF13ur15Ww47uFy3uw4kWFg_yoWDtFg_AF ZrX3Z3K34jy3Z0yr15Ww1fXFy0q39IkF4xKw4IvrW5Ar98Xr47JwsrAFy3GF9rGFs3ua45 uFy5Gr1DCr1rWjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUbYhF3UUUUU== X-Originating-IP: [101.86.213.176] X-CM-SenderInfo: xvkbvvri6rljoofrz/xtbByxbdX1PAProDmwAAsQ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use put_nsproxy() instead of ' if (atomic_dec_and_test(&ns->count)) { free_nsproxy(ns); }' in switch_task_namespaces(). and remove the whitespace by the way. Signed-off-by: Hui Su --- kernel/nsproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 12dd41b39a7f..3ebfd090398a 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c @@ -173,7 +173,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk) * it along with CLONE_NEWIPC. */ if ((flags & (CLONE_NEWIPC | CLONE_SYSVSEM)) == - (CLONE_NEWIPC | CLONE_SYSVSEM)) + (CLONE_NEWIPC | CLONE_SYSVSEM)) return -EINVAL; new_ns = create_new_namespaces(flags, tsk, user_ns, tsk->fs); @@ -250,8 +250,8 @@ void switch_task_namespaces(struct task_struct *p, struct nsproxy *new) p->nsproxy = new; task_unlock(p); - if (ns && atomic_dec_and_test(&ns->count)) - free_nsproxy(ns); + if (ns) + put_nsproxy(ns); } void exit_task_namespaces(struct task_struct *p) -- 2.29.0