From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628AbcDOPvg (ORCPT ); Fri, 15 Apr 2016 11:51:36 -0400 Received: from out03.mta.xmission.com ([166.70.13.233]:37900 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682AbcDOPuL (ORCPT ); Fri, 15 Apr 2016 11:50:11 -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:28 -0500 Message-Id: <1460734532-20134-12-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: U2FsdGVkX19TbdZZ6gM+nYoAtX4Jy1CJYems26bX2kg= 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 * [sa06 1397; Body=1 Fuz1=1 Fuz2=29] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=29 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 278 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 3.5 (1.3%), b_tie_ro: 2.6 (0.9%), parse: 0.68 (0.2%), extract_message_metadata: 12 (4.2%), get_uri_detail_list: 1.05 (0.4%), tests_pri_-1000: 6 (2.2%), tests_pri_-950: 1.18 (0.4%), tests_pri_-900: 1.02 (0.4%), tests_pri_-400: 20 (7.1%), check_bayes: 19 (6.7%), b_tokenize: 6 (2.1%), b_tok_get_all: 6 (2.1%), b_comp_prob: 1.55 (0.6%), b_tok_touch_all: 3.0 (1.1%), b_finish: 0.71 (0.3%), tests_pri_0: 227 (81.8%), check_dkim_signature: 0.45 (0.2%), check_dkim_adsp: 3.6 (1.3%), tests_pri_500: 4.2 (1.5%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 12/16] devpts: Move the creation of /dev/pts/ptmx into fill_super 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 The code makes more sense here and things are just clearer. Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index f33744debb59..3aa223803a08 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -296,6 +296,10 @@ static inline void update_ptmx_mode(struct pts_fs_info *fsi) { return; } +static inline int mknod_ptmx(struct super_block *sb) +{ + return 0; +} #endif static int devpts_remount(struct super_block *sb, int *flags, char *data) @@ -408,11 +412,19 @@ devpts_fill_super(struct super_block *s, void *data, int silent) set_nlink(inode, 2); s->s_root = d_make_root(inode); - if (s->s_root) - return 0; + if (!s->s_root) { + pr_err("get root dentry failed\n"); + goto fail; + } - pr_err("get root dentry failed\n"); + error = mknod_ptmx(s); + if (error) + goto fail_dput; + return 0; +fail_dput: + dput(s->s_root); + s->s_root = NULL; fail: return error; } @@ -481,10 +493,6 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type, 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 */ -- 2.8.1