From patchwork Sun Jun 19 14:11:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 12886673 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 160DCC43334 for ; Sun, 19 Jun 2022 14:11:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231712AbiFSOLc (ORCPT ); Sun, 19 Jun 2022 10:11:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbiFSOLa (ORCPT ); Sun, 19 Jun 2022 10:11:30 -0400 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFEC4B7E9; Sun, 19 Jun 2022 07:11:29 -0700 (PDT) Received: by mail-pj1-f51.google.com with SMTP id 73-20020a17090a0fcf00b001eaee69f600so8024782pjz.1; Sun, 19 Jun 2022 07:11:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FX9OqpFe7Pfnfmb+wnGlyvrvJuLGJWbixl9jf/rQVVM=; b=gZ88wRysS2SirnaGIh01KSdkNPmDcMiFSL1OaWRj6Kog1WUxwNg8p/A/h+c29/+1O/ 2WAQdRGARxmBXP1FieISekfFbI9eCx5Q38o5p8YmQXCpoUW3Ec7Kf/l9R/65hbgn/C10 kAXEziistHTk6tzEtoDCRixhh05cB8wQnhdvaZ48GFDzOS/4l92iKIk+6KPTQbcXMHuF xIAEHZVznRBTt/y/dsy4KeSzjrKer/RR+1usPYp0FWP7WavIYfYlyedntc6RqQGBkWRe ubHDH8sjS/98Q6PKvww82p5n6Id8n5fSFWHkS/SNBmneXyTrROyX8mjEjE11ryohIlVl Fi1g== X-Gm-Message-State: AJIora+roOD+x45SCGWFrIOknQVH8AdIy07DEAduQP6n055GxsH10kvp QIgG+ZScfoJNmQqMvo0AFyBwfixpwJlXWw== X-Google-Smtp-Source: AGRyM1vg8ExynVihVHvkTNCfjkxiSq1+kmn6k80B3CXsRXBPwmH6Z4yNK0ICQxlXrz3u6+2eGdXCTg== X-Received: by 2002:a17:90a:1c02:b0:1e0:df7:31f2 with SMTP id s2-20020a17090a1c0200b001e00df731f2mr33089602pjs.222.1655647888799; Sun, 19 Jun 2022 07:11:28 -0700 (PDT) Received: from localhost.localdomain ([211.49.23.9]) by smtp.gmail.com with ESMTPSA id o17-20020a170903301100b0016223016d79sm3473156pla.90.2022.06.19.07.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 07:11:27 -0700 (PDT) From: Namjae Jeon To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, hyc.lee@gmail.com, senozhatsky@chromium.org, Namjae Jeon , stable@vger.kernel.org Subject: [PATCH 1/2] ksmbd: set the range of bytes to zero without extending file size in FSCTL_ZERO_DATA Date: Sun, 19 Jun 2022 23:11:19 +0900 Message-Id: <20220619141120.12760-1-linkinjeon@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org generic/091, 263 test failed since commit f66f8b94e7f2 ("cifs: when extending a file with falloc we should make files not-sparse"). FSCTL_ZERO_DATA sets the range of bytes to zero without extending file size. The VFS_FALLOCATE_FL_KEEP_SIZE flag should be used even on non-sparse files. Cc: stable@vger.kernel.org Signed-off-by: Namjae Jeon Reviewed-by: Hyunchul Lee --- fs/ksmbd/vfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c index dcdd07c6efff..f194bf764f9f 100644 --- a/fs/ksmbd/vfs.c +++ b/fs/ksmbd/vfs.c @@ -1015,7 +1015,9 @@ int ksmbd_vfs_zero_data(struct ksmbd_work *work, struct ksmbd_file *fp, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, off, len); - return vfs_fallocate(fp->filp, FALLOC_FL_ZERO_RANGE, off, len); + return vfs_fallocate(fp->filp, + FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, + off, len); } int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length, From patchwork Sun Jun 19 14:11:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 12886674 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D531C433EF for ; Sun, 19 Jun 2022 14:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231833AbiFSOLg (ORCPT ); Sun, 19 Jun 2022 10:11:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbiFSOLf (ORCPT ); Sun, 19 Jun 2022 10:11:35 -0400 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1651B7F0; Sun, 19 Jun 2022 07:11:34 -0700 (PDT) Received: by mail-pj1-f45.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so4506065pjr.0; Sun, 19 Jun 2022 07:11:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qG1X/R0Mxy/riJeZK+qqMQXzwBuz+EMM+/jJlX4ZTUs=; b=BKfnkSpfrLhI1nMd90XmlpnKoHIybD5KmJsW8G3Om6vHN45vUgb7tVYC30zuIdojn9 sqdJ7YSshYZ+7tM49cBhXH5ZcKh8iKGePB/Zrh6t24JnCaLCfziptp8Znu4NTvoxJavD F/BEpmEm4cVrpV8Bz0mLfh4PWBtgJWfrd+zRGL1bJPUXaoMCEzp1EPExnb0a12mn7iOD XaS3XeyS63/osukI+o1g4myD2NdZ+em12k3lvwnxM29t2iJT5z5CXgjFdPWXJbhusGam ypLVQe+uLBkEcAAbTqDzL65vQsLkk8/lPS84jSBKI8UNK+E4t7ocMStaeVsKGg7/B5N7 6XbA== X-Gm-Message-State: AJIora+yQvIGc6sfAfR+QhKXPptHv2mffKd8ZbsQ1yvGBpQdHQkM3hWl iR7pninlk7kM+uZuHNR0kTcx5lcrxruSDQ== X-Google-Smtp-Source: AGRyM1swdaRn/1F1a1jX4QwaPecpLN+Fz5BPA4FS08bwtRnY6IxwsOpC1n44Km0KbnAkT8Aur4jOfg== X-Received: by 2002:a17:90b:4b83:b0:1e3:3ad3:612c with SMTP id lr3-20020a17090b4b8300b001e33ad3612cmr31930832pjb.87.1655647893871; Sun, 19 Jun 2022 07:11:33 -0700 (PDT) Received: from localhost.localdomain ([211.49.23.9]) by smtp.gmail.com with ESMTPSA id o17-20020a170903301100b0016223016d79sm3473156pla.90.2022.06.19.07.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 07:11:33 -0700 (PDT) From: Namjae Jeon To: linux-cifs@vger.kernel.org Cc: smfrench@gmail.com, hyc.lee@gmail.com, senozhatsky@chromium.org, Namjae Jeon , stable@vger.kernel.org Subject: [PATCH 2/2] ksmbd: check invalid FileOffset and BeyondFinalZero in FSCTL_ZERO_DATA Date: Sun, 19 Jun 2022 23:11:20 +0900 Message-Id: <20220619141120.12760-2-linkinjeon@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220619141120.12760-1-linkinjeon@kernel.org> References: <20220619141120.12760-1-linkinjeon@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org FileOffset should not be greater than BeyondFinalZero in FSCTL_ZERO_DATA. And don't call ksmbd_vfs_zero_data() if length is zero. Cc: stable@vger.kernel.org Signed-off-by: Namjae Jeon Reviewed-by: Hyunchul Lee --- fs/ksmbd/smb2pdu.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index e35930867893..94ab1dcd80e7 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -7700,7 +7700,7 @@ int smb2_ioctl(struct ksmbd_work *work) { struct file_zero_data_information *zero_data; struct ksmbd_file *fp; - loff_t off, len; + loff_t off, len, bfz; if (!test_tree_conn_flag(work->tcon, KSMBD_TREE_CONN_FLAG_WRITABLE)) { ksmbd_debug(SMB, @@ -7717,19 +7717,26 @@ int smb2_ioctl(struct ksmbd_work *work) zero_data = (struct file_zero_data_information *)&req->Buffer[0]; - fp = ksmbd_lookup_fd_fast(work, id); - if (!fp) { - ret = -ENOENT; + off = le64_to_cpu(zero_data->FileOffset); + bfz = le64_to_cpu(zero_data->BeyondFinalZero); + if (off > bfz) { + ret = -EINVAL; goto out; } - off = le64_to_cpu(zero_data->FileOffset); - len = le64_to_cpu(zero_data->BeyondFinalZero) - off; + len = bfz - off; + if (len) { + fp = ksmbd_lookup_fd_fast(work, id); + if (!fp) { + ret = -ENOENT; + goto out; + } - ret = ksmbd_vfs_zero_data(work, fp, off, len); - ksmbd_fd_put(work, fp); - if (ret < 0) - goto out; + ret = ksmbd_vfs_zero_data(work, fp, off, len); + ksmbd_fd_put(work, fp); + if (ret < 0) + goto out; + } break; } case FSCTL_QUERY_ALLOCATED_RANGES: