Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1084402ybv; Thu, 20 Feb 2020 12:53:58 -0800 (PST) X-Google-Smtp-Source: APXvYqyl04KmNY23RDOdsDjnd8SDR5q1nRj8+NO8GxncuJOeti1bbGS/7Rnp2UynKiUp5ntXuYyH X-Received: by 2002:a05:6830:18f1:: with SMTP id d17mr24945664otf.303.1582232038806; Thu, 20 Feb 2020 12:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582232038; cv=none; d=google.com; s=arc-20160816; b=lCSgttMA9CHDEOnIhlNYSKnXyWJFGPZKXMkimYHjsey+afweNdX4YtWwZgp6GWmb8m zRdyMugpIatwNh/PXlVUXGnDlVw0N1XiZO1ZC+QpEpJf2o7K0ZkSn1r/eVEFsMliwUZr rTjSgT045Thjd1dmpZ14fsf8KsB3f9ot2ymUa9CVlIdOWgd/ib6aKuBannrkfEDsZwPE 8xksAhLrQby18FoYCPRqqa/BulJIR6l9bfKYQl65VIh5gOxKM2OQwL1dh32kdlN8T9+S EAfe+agCx2YyQ4paJHx4IFmOVy6ebtDfzgvnmyCdrj2tSEhkbqQeAvS/Txh1NXLTd9KY x45w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:mime-version:user-agent :message-id:in-reply-to:date:references:cc:to:from; bh=rU/IgaBeQaqEAdUDdF1OBGfJTjZ3goIr6U+XynSSgfE=; b=XJFZ/pGu7V+j3+RuGloQ14Lj3m23kOrOWi8V35yu3S/SbqUv6huC4mGjd4O4dNZm+X uEZSofk3JZmaPEf4Esg9xtMz+sJnV3bfIZfFHaDJ2ToRRearhDxDilBKH6pUWq16P4KF 1ks/igRFDWjMdWU8sekVCCuJTeOX/sanm4e8oegXnBchGJAxuFLcQVn5/IEtribjxipI RHd1zqb3qpjhg2ZXsm35BOzzhQ3Z6i8+Rh2I8penq8Uc9a147Gd+Ids7Yl+gM0+9n1q+ nmvGhPVhi3MhplSW/1VddipH41QuHou9WlyuJ31vtT762sg54kmqHGxyRVOg79yEKOFS ydlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x25si195846oie.261.2020.02.20.12.53.45; Thu, 20 Feb 2020 12:53:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729052AbgBTUxl (ORCPT + 99 others); Thu, 20 Feb 2020 15:53:41 -0500 Received: from out02.mta.xmission.com ([166.70.13.232]:49616 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728688AbgBTUxk (ORCPT ); Thu, 20 Feb 2020 15:53:40 -0500 Received: from in01.mta.xmission.com ([166.70.13.51]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1j4spH-00027H-L2; Thu, 20 Feb 2020 13:53:39 -0700 Received: from ip68-227-160-95.om.om.cox.net ([68.227.160.95] helo=x220.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1j4spG-0005x1-BZ; Thu, 20 Feb 2020 13:53:39 -0700 From: ebiederm@xmission.com (Eric W. Biederman) To: Linus Torvalds Cc: Al Viro , LKML , Kernel Hardening , Linux API , Linux FS Devel , Linux Security Module , Akinobu Mita , Alexey Dobriyan , Andrew Morton , Andy Lutomirski , Daniel Micay , Djalal Harouni , "Dmitry V . Levin" , Greg Kroah-Hartman , Ingo Molnar , "J . Bruce Fields" , Jeff Layton , Jonathan Corbet , Kees Cook , Oleg Nesterov , Solar Designer References: <20200210150519.538333-8-gladkov.alexey@gmail.com> <87v9odlxbr.fsf@x220.int.ebiederm.org> <20200212144921.sykucj4mekcziicz@comp-core-i7-2640m-0182e6> <87tv3vkg1a.fsf@x220.int.ebiederm.org> <87v9obipk9.fsf@x220.int.ebiederm.org> <20200212200335.GO23230@ZenIV.linux.org.uk> <20200212203833.GQ23230@ZenIV.linux.org.uk> <20200212204124.GR23230@ZenIV.linux.org.uk> <87lfp7h422.fsf@x220.int.ebiederm.org> <87pnejf6fz.fsf@x220.int.ebiederm.org> <871rqpaswu.fsf_-_@x220.int.ebiederm.org> Date: Thu, 20 Feb 2020 14:51:38 -0600 In-Reply-To: <871rqpaswu.fsf_-_@x220.int.ebiederm.org> (Eric W. Biederman's message of "Thu, 20 Feb 2020 14:46:25 -0600") Message-ID: <8736b59e3p.fsf_-_@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1j4spG-0005x1-BZ;;;mid=<8736b59e3p.fsf_-_@x220.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=68.227.160.95;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX19DTetfpqNyVK1RVE7gBNaoSNIVSGPjvlE= X-SA-Exim-Connect-IP: 68.227.160.95 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa04.xmission.com X-Spam-Level: ** X-Spam-Status: No, score=2.0 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,XMNoVowels,XMSubLong autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4636] * 0.7 XMSubLong Long Subject * 1.5 XMNoVowels Alpha-numberic number with no vowels * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa04 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 553 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 2.3 (0.4%), b_tie_ro: 1.60 (0.3%), parse: 0.78 (0.1%), extract_message_metadata: 9 (1.6%), get_uri_detail_list: 0.90 (0.2%), tests_pri_-1000: 12 (2.2%), tests_pri_-950: 0.98 (0.2%), tests_pri_-900: 0.80 (0.1%), tests_pri_-90: 22 (4.0%), check_bayes: 21 (3.8%), b_tokenize: 7 (1.3%), b_tok_get_all: 7 (1.3%), b_comp_prob: 1.82 (0.3%), b_tok_touch_all: 3.2 (0.6%), b_finish: 0.54 (0.1%), tests_pri_0: 494 (89.4%), check_dkim_signature: 0.43 (0.1%), check_dkim_adsp: 2.4 (0.4%), poll_dns_idle: 1.01 (0.2%), tests_pri_10: 2.0 (0.4%), tests_pri_500: 6 (1.0%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 5/7] proc: Clear the pieces of proc_inode that proc_evict_inode cares about X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This just keeps everything tidier, and allows for using flags like SLAB_TYPESAFE_BY_RCU where slabs are not always cleared before reuse. I don't see reuse without reinitializing happening with the proc_inode but I had a false alarm while reworking flushing of proc dentries and indoes when a process dies that caused me to tidy this up. The code is a little easier to follow and reason about this way so I figured the changes might as well be kept. Signed-off-by: "Eric W. Biederman" --- fs/proc/inode.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index c4528c419876..3c9082cd257b 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -33,21 +33,27 @@ static void proc_evict_inode(struct inode *inode) { struct proc_dir_entry *de; struct ctl_table_header *head; + struct proc_inode *ei = PROC_I(inode); truncate_inode_pages_final(&inode->i_data); clear_inode(inode); /* Stop tracking associated processes */ - put_pid(PROC_I(inode)->pid); + if (ei->pid) { + put_pid(ei->pid); + ei->pid = NULL; + } /* Let go of any associated proc directory entry */ - de = PDE(inode); - if (de) + de = ei->pde; + if (de) { pde_put(de); + ei->pde = NULL; + } - head = PROC_I(inode)->sysctl; + head = ei->sysctl; if (head) { - RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL); + RCU_INIT_POINTER(ei->sysctl, NULL); proc_sys_evict_inode(inode, head); } } -- 2.20.1