From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752439AbcDOPrp (ORCPT ); Fri, 15 Apr 2016 11:47:45 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:51137 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751531AbcDOPqy (ORCPT ); Fri, 15 Apr 2016 11:46:54 -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:22 -0500 Message-Id: <1460734532-20134-6-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: U2FsdGVkX19phi9LGLISGON6C429E8Oqt3LaJi7sFeU= 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 Fuz2=24] X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 Fuz2=24 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 229 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 3.8 (1.7%), b_tie_ro: 2.8 (1.2%), parse: 0.88 (0.4%), extract_message_metadata: 14 (6.0%), get_uri_detail_list: 1.01 (0.4%), tests_pri_-1000: 6 (2.7%), tests_pri_-950: 1.18 (0.5%), tests_pri_-900: 1.01 (0.4%), tests_pri_-400: 17 (7.6%), check_bayes: 16 (7.1%), b_tokenize: 4.9 (2.1%), b_tok_get_all: 5 (2.3%), b_comp_prob: 1.41 (0.6%), b_tok_touch_all: 2.5 (1.1%), b_finish: 0.72 (0.3%), tests_pri_0: 178 (77.6%), check_dkim_signature: 0.42 (0.2%), check_dkim_adsp: 3.8 (1.7%), tests_pri_500: 4.4 (1.9%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 06/16] devpts: More obvious check for the system devpts in pty allocation 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 This makes the logic of the test clearer, and removes a confusing use of opts.newinstance, which allows later changes not to worry if newinstance is set on the primary mount of devpts or not. Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 0b84063a1e14..752b2cc6be1c 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -534,7 +534,7 @@ retry: mutex_lock(&allocated_ptys_lock); if (pty_count >= pty_limit - - (fsi->mount_opts.newinstance ? pty_reserve : 0)) { + ((devpts_mnt->mnt_sb == sb) ? pty_reserve : 0)) { mutex_unlock(&allocated_ptys_lock); return -ENOSPC; } -- 2.8.1