| Message ID | 20160914185338.15126-4-ebiederm@xmission.com |
|---|---|
| State | New |
| Series | "Minor devpts cleanups, fixes and enhancments" |
| Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.166.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Wed, 14 Sep 2016 21:08:03 +0200 (CEST) Received: by 10.176.66.133 with SMTP id j5csp2651084uaj; Wed, 14 Sep 2016 12:07:59 -0700 (PDT) X-Received: by 10.66.146.201 with SMTP id te9mr7309091pab.104.1473880079855; Wed, 14 Sep 2016 12:07:59 -0700 (PDT) Return-Path: <containers-bounces@lists.linux-foundation.org> Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id i129si240803pfe.19.2016.09.14.12.07.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Sep 2016 12:07:59 -0700 (PDT) Received-SPF: pass (google.com: domain of containers-bounces@lists.linux-foundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of containers-bounces@lists.linux-foundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=containers-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id DACBCA1E; Wed, 14 Sep 2016 19:07:44 +0000 (UTC) X-Original-To: containers@lists.linux-foundation.org Delivered-To: containers@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8B44BA18 for <containers@lists.linux-foundation.org>; Wed, 14 Sep 2016 19:07:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from out03.mta.xmission.com (out03.mta.xmission.com [166.70.13.233]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 55D63A5 for <containers@lists.linux-foundation.org>; Wed, 14 Sep 2016 19:07:44 +0000 (UTC) Received: from in01.mta.xmission.com ([166.70.13.51]) by out03.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from <ebiederm@xmission.com>) id 1bkFX5-00048V-N3; Wed, 14 Sep 2016 13:07:43 -0600 Received: from 97-119-97-64.omah.qwest.net ([97.119.97.64] helo=x220.int.ebiederm.org) by in01.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from <ebiederm@xmission.com>) id 1bkFX3-0000r5-Im; Wed, 14 Sep 2016 13:07:43 -0600 From: "Eric W. Biederman" <ebiederm@xmission.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.com> Date: Wed, 14 Sep 2016 13:53:36 -0500 Message-Id: <20160914185338.15126-4-ebiederm@xmission.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160914185338.15126-1-ebiederm@xmission.com> References: <87sht25n73.fsf@x220.int.ebiederm.org> <20160914185338.15126-1-ebiederm@xmission.com> X-XM-SPF: eid=1bkFX3-0000r5-Im; ; ; mid=<20160914185338.15126-4-ebiederm@xmission.com>; ; ; hst=in01.mta.xmission.com; ; ; ip=97.119.97.64; ; ; frm=ebiederm@xmission.com; ; ; spf=neutral X-XM-AID: U2FsdGVkX180CS8DAMQDTAlEj11EMFL2/uL20NNubC8= X-SA-Exim-Connect-IP: 97.119.97.64 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org X-Spam-Level: X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-DCC: XMission; sa08 1397; Body=1 Fuz1=1 X-Spam-Combo: ;Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.com> X-Spam-Relay-Country: X-Spam-Timing: total 1676 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 1406 (83.9%), b_tie_ro: 1402 (83.6%), parse: 1.05 (0.1%), extract_message_metadata: 25 (1.5%), get_uri_detail_list: 0.57 (0.0%), tests_pri_-1000: 14 (0.8%), tests_pri_-950: 17 (1.0%), tests_pri_-900: 1.02 (0.1%), tests_pri_-400: 25 (1.5%), check_bayes: 24 (1.4%), b_tokenize: 3.7 (0.2%), b_tok_get_all: 9 (0.5%), b_comp_prob: 1.14 (0.1%), b_tok_touch_all: 2.2 (0.1%), b_finish: 0.75 (0.0%), tests_pri_0: 166 (9.9%), check_dkim_signature: 0.69 (0.0%), check_dkim_adsp: 2.6 (0.2%), tests_pri_500: 10 (0.6%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH tty-next 4/6] devpts: Make devpts_kill_sb safe if fsi is NULL 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) Cc: linux-fsdevel@vger.kernel.org, Linux Containers <containers@lists.linux-foundation.org>, "Eric W. Biederman" <ebiederm@xmission.com>, linux-kernel@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com> X-BeenThere: containers@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux Containers <containers.lists.linux-foundation.org> List-Unsubscribe: <https://lists.linuxfoundation.org/mailman/options/containers>, <mailto:containers-request@lists.linux-foundation.org?subject=unsubscribe> List-Archive: <http://lists.linuxfoundation.org/pipermail/containers/> List-Post: <mailto:containers@lists.linux-foundation.org> List-Help: <mailto:containers-request@lists.linux-foundation.org?subject=help> List-Subscribe: <https://lists.linuxfoundation.org/mailman/listinfo/containers>, <mailto:containers-request@lists.linux-foundation.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: containers-bounces@lists.linux-foundation.org Errors-To: containers-bounces@lists.linux-foundation.org |
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index a48b40b0bd1e..e058ec677207 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -458,7 +458,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); }
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- fs/devpts/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)