From patchwork Tue Jul 11 13:47:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 9834735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2813F60318 for ; Tue, 11 Jul 2017 13:47:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 171ED2821F for ; Tue, 11 Jul 2017 13:47:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0834B28429; Tue, 11 Jul 2017 13:47:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AC512821F for ; Tue, 11 Jul 2017 13:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932407AbdGKNrO (ORCPT ); Tue, 11 Jul 2017 09:47:14 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:59306 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755296AbdGKNrO (ORCPT ); Tue, 11 Jul 2017 09:47:14 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v6BDhu4Q143815 for ; Tue, 11 Jul 2017 09:47:13 -0400 Received: from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158]) by mx0a-001b2d01.pphosted.com with ESMTP id 2bmb56unp9-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 11 Jul 2017 09:47:13 -0400 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Jul 2017 07:47:12 -0600 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 11 Jul 2017 07:47:10 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v6BDlAKL63897846; Tue, 11 Jul 2017 06:47:10 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 049DF78051; Tue, 11 Jul 2017 07:47:10 -0600 (MDT) Received: from localhost.localdomain.com (unknown [9.102.3.119]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id 1C8757803F; Tue, 11 Jul 2017 07:47:07 -0600 (MDT) From: Chandan Rajendra To: linux-fsdevel@vger.kernel.org Cc: Chandan Rajendra , viro@zeniv.linux.org.uk, abdhalee@linux.vnet.ibm.com, joe@perches.com Subject: [PATCH] get_fs_type: Validate fs type string argument Date: Tue, 11 Jul 2017 19:17:09 +0530 X-Mailer: git-send-email 2.9.4 X-TM-AS-GCONF: 00 x-cbid: 17071113-0024-0000-0000-000016D46C62 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007349; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000214; SDB=6.00886035; UDB=6.00442239; IPR=6.00666184; BA=6.00005468; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016176; XFM=3.00000015; UTC=2017-07-11 13:47:12 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17071113-0025-0000-0000-00004BC84ED3 Message-Id: <20170711134709.29343-1-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-07-11_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707110215 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On ppc64, When a non-nul terminated string is passed as an argument to the mount(2) syscall, copy_mount_string() ends up allocating 64k (the PAGE_SIZE on ppc64) worth of space for holding the string in kernel's address space. Later, in set_precision() (invoked indirectly by get_fs_type()), we end up assigning 65535 as the value to 'struct printf_spec'->precision member. This field has a width of 16 bits and hence a truncated version of the original value ends up being assigned. This causes the "WARN_ONCE(spec->precision != prec, "precision %d too large", prec)" statement inside set_precision() to be executed. This commit fixes the bug by validating the length of the "filesystem type" argument passed to get_fs_type() function. Signed-off-by: Chandan Rajendra Reported-by: Abdul Haleem Suggested-by: Joe Perches --- fs/filesystems.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/filesystems.c b/fs/filesystems.c index a920ad2..8e309d3 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c @@ -275,6 +275,9 @@ struct file_system_type *get_fs_type(const char *name) const char *dot = strchr(name, '.'); int len = dot ? dot - name : strlen(name); + if (len >= PATH_MAX) + return NULL; + fs = __get_fs_type(name, len); if (!fs && (request_module("fs-%.*s", len, name) == 0)) { fs = __get_fs_type(name, len);