From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B74F3C3A59F for ; Fri, 16 Aug 2019 05:56:52 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C88C206C2; Fri, 16 Aug 2019 05:56:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="SZzucAVJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="asipkeRm"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Um6fyZnK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C88C206C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1hyVEK-0007dq-8C; Fri, 16 Aug 2019 05:56:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hyVEI-0007dP-Ov for linux-f2fs-devel@lists.sourceforge.net; Fri, 16 Aug 2019 05:56:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=d4Pvny3rtTNcjZmNduYfXCNqc0iOTER48ySWthsFjkw=; b=SZzucAVJjT4wSnAweJTrUEYSFP Oc2KIvzP/Yd2xlvNdF8bLLx0OB7yJHHcfidGrpSbwULqVW8JUbsCd9mB9AhBD8F98MIlewSxTxtyP /cmnKXrst9po+2lkzJIVrkwNoOlur4FiMQHaaWY8NdwqUFE2GQhyx/TGiLCLBekd+kxE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=d4Pvny3rtTNcjZmNduYfXCNqc0iOTER48ySWthsFjkw=; b=asipkeRmNNHt3859YC0qQsn+2T +1OO0ddhJXDOZcsDO52WcSJRqqJGEc1gG+RXYas0H41yrO2CLpTsAtjaXphh2Vb+dLhsjBvF+tjh/ lc+FLidW+QTQdZ8yDAPkKWmbnwkDWDaFR9acj0qflRtPBelOIp+yRdhX5NWqpTB6fiL4=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hyVEH-0058Cx-Bf for linux-f2fs-devel@lists.sourceforge.net; Fri, 16 Aug 2019 05:56:50 +0000 Received: from sol.localdomain (c-24-5-143-220.hsd1.ca.comcast.net [24.5.143.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E449B206C2 for ; Fri, 16 Aug 2019 05:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565935003; bh=hEWy1FwHE3RwJ09MdALkIVvXegYypAnkkam0aCtTXAg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Um6fyZnKF7j6ipcYZmBkP1eqEbDGYlMOsGofwPRzrOkZTTY3DyRFxChI+M3pyx4DU ZiXKma2AFkGT+N5xiwS2dunlQwhvvmHu6LXFtyBsLx8+n/VbI2hYWu0HeNVjue+rlW hc3VUuOP+gFXENaMiymb1mL93be3/WQo8rxUw2IY= From: Eric Biggers To: linux-f2fs-devel@lists.sourceforge.net Date: Thu, 15 Aug 2019 22:55:38 -0700 Message-Id: <20190816055539.30420-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190816055539.30420-1-ebiggers@kernel.org> References: <20190816055539.30420-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Headers-End: 1hyVEH-0058Cx-Bf Subject: [f2fs-dev] [PATCH 2/3] f2fs: fix copying too many bytes in FS_IOC_SETFSLABEL X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Eric Biggers Userspace provides a null-terminated string, so don't assume that the full FSLABEL_MAX bytes can always be copied. Fixes: 61a3da4d5ef8 ("f2fs: support FS_IOC_{GET,SET}FSLABEL") Signed-off-by: Eric Biggers --- fs/f2fs/file.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index d521a582d94d..315127251bc1 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3111,23 +3111,11 @@ static int f2fs_set_volume_name(struct file *filp, unsigned long arg) struct inode *inode = file_inode(filp); struct f2fs_sb_info *sbi = F2FS_I_SB(inode); char *vbuf; - int len; int err = 0; - vbuf = f2fs_kzalloc(sbi, MAX_VOLUME_NAME, GFP_KERNEL); - if (!vbuf) - return -ENOMEM; - - if (copy_from_user(vbuf, (char __user *)arg, FSLABEL_MAX)) { - err = -EFAULT; - goto out; - } - - len = strnlen(vbuf, FSLABEL_MAX); - if (len > FSLABEL_MAX - 1) { - err = -EINVAL; - goto out; - } + vbuf = strndup_user((const char __user *)arg, FSLABEL_MAX); + if (IS_ERR(vbuf)) + return PTR_ERR(vbuf); err = mnt_want_write_file(filp); if (err) @@ -3137,7 +3125,7 @@ static int f2fs_set_volume_name(struct file *filp, unsigned long arg) memset(sbi->raw_super->volume_name, 0, sizeof(sbi->raw_super->volume_name)); - utf8s_to_utf16s(vbuf, MAX_VOLUME_NAME, UTF16_LITTLE_ENDIAN, + utf8s_to_utf16s(vbuf, strlen(vbuf), UTF16_LITTLE_ENDIAN, sbi->raw_super->volume_name, ARRAY_SIZE(sbi->raw_super->volume_name)); @@ -3147,7 +3135,7 @@ static int f2fs_set_volume_name(struct file *filp, unsigned long arg) mnt_drop_write_file(filp); out: - kvfree(vbuf); + kfree(vbuf); return err; } -- 2.22.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel