Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932612AbcDEBkw (ORCPT ); Mon, 4 Apr 2016 21:40:52 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:49956 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932543AbcDEBkr (ORCPT ); Mon, 4 Apr 2016 21:40:47 -0400 From: "Eric W. Biederman" To: Linus Torvalds Cc: "H. Peter Anvin" , Peter Hurley , Greg KH , Jiri Slaby , Aurelien Jarno , Andy Lutomirski , Florian Weimer , Al Viro , Serge Hallyn , Jann Horn , "security@kernel.org" , security@ubuntu.com, security@debian.org, Willy Tarreau , Linux Kernel Mailing List , "Eric W. Biederman" Date: Mon, 4 Apr 2016 20:29:20 -0500 Message-Id: <1459819769-30387-4-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1459819769-30387-1-git-send-email-ebiederm@xmission.com> References: <878u0s3orx.fsf_-_@x220.int.ebiederm.org> <1459819769-30387-1-git-send-email-ebiederm@xmission.com> X-XM-AID: U2FsdGVkX18pPoR5jDaUB/fLUde3kZsNJbnkQxyutD8= 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.7 XMSubLong Long Subject * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.0 TVD_RCVD_IP Message was received from an IP address * 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=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 336 ms - load_scoreonly_sql: 0.09 (0.0%), signal_user_changed: 4.3 (1.3%), b_tie_ro: 2.9 (0.9%), parse: 2.2 (0.7%), extract_message_metadata: 21 (6.2%), get_uri_detail_list: 1.88 (0.6%), tests_pri_-1000: 8 (2.3%), tests_pri_-950: 1.39 (0.4%), tests_pri_-900: 1.13 (0.3%), tests_pri_-400: 28 (8.3%), check_bayes: 27 (7.9%), b_tokenize: 12 (3.5%), b_tok_get_all: 6 (1.9%), b_comp_prob: 3.2 (0.9%), b_tok_touch_all: 2.8 (0.8%), b_finish: 0.80 (0.2%), tests_pri_0: 260 (77.3%), check_dkim_signature: 0.61 (0.2%), check_dkim_adsp: 3.1 (0.9%), tests_pri_500: 6 (1.8%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 04/13] devpts: Stop rolling devpts_remount by hand in devpts_mount 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 in02.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1492 Lines: 57 Just use devpts_remount and by doing so ensuring that ptxmode actually get propogated to /dev/pts/ptmx on the initial mount of devpts. Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index c3d53d2f7c3e..14be886f987c 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -338,12 +338,6 @@ static int mknod_ptmx(struct super_block *sb) inode_lock(d_inode(root)); - /* If we have already created ptmx node, return */ - if (fsi->ptmx_dentry) { - rc = 0; - goto out; - } - dentry = d_alloc_name(root, "ptmx"); if (!dentry) { pr_err("Unable to alloc dentry for ptmx node\n"); @@ -552,16 +546,20 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type, error = devpts_fill_super(s, data, flags & MS_SILENT ? 1 : 0); if (error) goto out_undo_sget; - s->s_flags |= MS_ACTIVE; - } - error = parse_mount_options(data, &DEVPTS_SB(s)->mount_opts); - if (error) - goto out_undo_sget; + error = parse_mount_options(data, &DEVPTS_SB(s)->mount_opts); + if (error) + goto out_undo_sget; + + error = mknod_ptmx(s); + if (error) + goto out_undo_sget; - error = mknod_ptmx(s); - if (error) - goto out_undo_sget; + s->s_flags |= MS_ACTIVE; + } else { + /* Match mount_single ignore errors on remount */ + devpts_remount(s, &flags, data); + } return dget(s->s_root); -- 2.6.3