From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932742AbcDEBl1 (ORCPT ); Mon, 4 Apr 2016 21:41:27 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:41336 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757072AbcDEBlY (ORCPT ); Mon, 4 Apr 2016 21:41:24 -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:23 -0500 Message-Id: <1459819769-30387-7-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: U2FsdGVkX18Egk26foZItVnd2oWLvHG4AzYiLpyQz5M= 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 * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: **;Linus Torvalds X-Spam-Relay-Country: X-Spam-Timing: total 274 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 3.8 (1.4%), b_tie_ro: 2.7 (1.0%), parse: 0.79 (0.3%), extract_message_metadata: 12 (4.4%), get_uri_detail_list: 1.05 (0.4%), tests_pri_-1000: 6 (2.3%), tests_pri_-950: 1.21 (0.4%), tests_pri_-900: 1.05 (0.4%), tests_pri_-400: 19 (7.0%), check_bayes: 18 (6.6%), b_tokenize: 6 (2.2%), b_tok_get_all: 6 (2.0%), b_comp_prob: 1.50 (0.5%), b_tok_touch_all: 3.1 (1.1%), b_finish: 0.65 (0.2%), tests_pri_0: 223 (81.4%), check_dkim_signature: 0.53 (0.2%), check_dkim_adsp: 2.9 (1.1%), tests_pri_500: 3.8 (1.4%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 07/13] devpts: Move parse_mount_options 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 in02.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: "Eric W. Biederman" --- fs/devpts/inode.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 80c78bb472a9..46d633ab16c7 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -462,6 +462,7 @@ static int devpts_fill_super(struct super_block *s, void *data, int silent) { struct inode *inode; + int error; s->s_blocksize = 1024; s->s_blocksize_bits = 10; @@ -469,10 +470,16 @@ devpts_fill_super(struct super_block *s, void *data, int silent) s->s_op = &devpts_sops; s->s_time_gran = 1; + error = -ENOMEM; s->s_fs_info = new_pts_fs_info(); if (!s->s_fs_info) goto fail; + error = parse_mount_options(data, &DEVPTS_SB(s)->mount_opts); + if (error) + goto fail; + + error = -ENOMEM; inode = new_inode(s); if (!inode) goto fail; @@ -490,7 +497,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) pr_err("get root dentry failed\n"); fail: - return -ENOMEM; + return error; } #ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES @@ -557,10 +564,6 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type, 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; -- 2.6.3