Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397AbcDOPuN (ORCPT ); Fri, 15 Apr 2016 11:50:13 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:51723 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294AbcDOPuK (ORCPT ); Fri, 15 Apr 2016 11:50:10 -0400 From: "Eric W. Biederman" To: Linus Torvalds Cc: "H. Peter Anvin" , Andy Lutomirski , security@debian.org, security@kernel.org, Al Viro , security@ubuntu.com, Peter Hurley , Serge Hallyn , Willy Tarreau , Aurelien Jarno , One Thousand Gnomes , Jann Horn , Greg KH , Linux Kernel Mailing List , Jiri Slaby , Florian Weimer , "Eric W. Biederman" Date: Fri, 15 Apr 2016 10:35:27 -0500 Message-Id: <1460734532-20134-11-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460734532-20134-1-git-send-email-ebiederm@xmission.com> References: <877ffyzy1j.fsf_-_@x220.int.ebiederm.org> <1460734532-20134-1-git-send-email-ebiederm@xmission.com> X-XM-AID: U2FsdGVkX18Ogt8k6wZabpkobHccXCLVcwDHgyVw4n0= X-SA-Exim-Connect-IP: 67.3.249.252 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.7 XMSubLong Long Subject * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; Body=1 Fuz1=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 201 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.0 (1.5%), b_tie_ro: 2.2 (1.1%), parse: 0.62 (0.3%), extract_message_metadata: 11 (5.4%), get_uri_detail_list: 0.55 (0.3%), tests_pri_-1000: 6 (3.0%), tests_pri_-950: 1.13 (0.6%), tests_pri_-900: 1.00 (0.5%), tests_pri_-400: 16 (8.2%), check_bayes: 15 (7.7%), b_tokenize: 4.6 (2.3%), b_tok_get_all: 4.9 (2.5%), b_comp_prob: 1.20 (0.6%), b_tok_touch_all: 2.7 (1.3%), b_finish: 0.64 (0.3%), tests_pri_0: 155 (77.3%), check_dkim_signature: 0.43 (0.2%), check_dkim_adsp: 2.9 (1.5%), tests_pri_500: 3.9 (2.0%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 11/16] devpts: Make devpts_kill_sb safe if fsi is NULL X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 535 Lines: 21 Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 2f2760142ed2..f33744debb59 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -514,7 +514,8 @@ static void devpts_kill_sb(struct super_block *sb) { struct pts_fs_info *fsi = DEVPTS_SB(sb); - ida_destroy(&fsi->allocated_ptys); + if (fsi) + ida_destroy(&fsi->allocated_ptys); kfree(fsi); kill_litter_super(sb); } -- 2.8.1