From patchwork Thu Jan 26 08:58:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fedor Pchelkin X-Patchwork-Id: 48532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp176114wrn; Thu, 26 Jan 2023 01:08:49 -0800 (PST) X-Google-Smtp-Source: AK7set/yeIsimKHpX8rLPXRHEpa4qNYlzlntG3cQcdqoah/OjhXIKZ9zpSbj0ogI4whJ5xObOXQ7 X-Received: by 2002:a05:6a00:e18:b0:590:773c:69b2 with SMTP id bq24-20020a056a000e1800b00590773c69b2mr2967372pfb.21.1674724129204; Thu, 26 Jan 2023 01:08:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674724129; cv=none; d=google.com; s=arc-20160816; b=qhNsDfpuSs1VDpX+q/Q6mCHEbGsh6Un8yzOlASqKdgves+0fMg0fOrTSW+NbNeWrCY sqfl0H6q/3VAuvWjPxKv+1O6WDHtOYWNLPUZAfh1EEzswTQVXXyI7MGkNdXxpvu0MZvK h7g75Uq2RIenK0HgWyVt3kYjUmjPLhIGRoT6jCNVYrwXN9TM9eo20mLg1IEEs24JK0jI H/f6PmnBlLa5yaAfVsDq2eGFPKiOyCqQeVJdZlaPSHLVQ3PKLS9uiaF+ws89zlOuQegv jzCDZ8ra9At252mJzhAC0ew4aoTJqeD+ZEA7qbUI5IQhMlshy1X4fzFBSugXSMzR+7VZ inZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=3+YMP5uQItOPeyz0DXAukyJSBmkHOU6buO5hiOYrjyc=; b=LwsjNZ/RUsiCCpWhzU27DjpfKrS8EdHnFP5qU2807W8E9Yv3uy33AFMj9/CiRA8slm kOv3fQGG5RLTm0AGp5IXp+TOcE9o3OBauMvVASEaP7/VcwHEQITH3RKEt0HY/dVBCLTf hEk3bgux9M5iErK0mM6GqJ8BFuhnasX7TmelRg09QMOJ9qxWOCNVKYBB4SR2i3oAVwFj 1Ok4irsGR4K62FRyt0rSyhddnfLiIkRBBlc+fz0slxQpcykRn3F7s0jVB3kwab4WRdMn UBUXZINeMTuNVc4xYvTlcRSpuWOb0mf0wjUYcmvFDhPnD414OKaShcWvzBndyuLruBlR 8hwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=J1Glr9iD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i190-20020a6254c7000000b00580439e00fasi681427pfb.45.2023.01.26.01.08.36; Thu, 26 Jan 2023 01:08:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ispras.ru header.s=default header.b=J1Glr9iD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236622AbjAZI7g (ORCPT + 99 others); Thu, 26 Jan 2023 03:59:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbjAZI7e (ORCPT ); Thu, 26 Jan 2023 03:59:34 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7BAD83EE; Thu, 26 Jan 2023 00:59:33 -0800 (PST) Received: from fedcomp.. (unknown [46.242.14.200]) by mail.ispras.ru (Postfix) with ESMTPSA id ADF0D44C1019; Thu, 26 Jan 2023 08:59:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru ADF0D44C1019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1674723570; bh=3+YMP5uQItOPeyz0DXAukyJSBmkHOU6buO5hiOYrjyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J1Glr9iDV6y3Ooza+EZpcoS3Ab2bDvKMA/1slAvhdeMpjApTa7cnUP/ylSp3tF6Ev cCQn9yO6N//BDcxM2l81sfyKciqNh+Q4/BvaYD+ryPo98MSiszTuYHla84nCLNpbw0 i6uNb89UH4dxaZkclyKsUdJRZUJz+mno+iV5XTWc= From: Fedor Pchelkin To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Fedor Pchelkin , Jan Kara , Dongliang Mu , Al Viro , David Howells , reiserfs-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Khoroshilov , lvc-project@linuxtesting.org Subject: [PATCH 4.14/4.19/5.4/5.10/5.15 1/1] fs: reiserfs: remove useless new_opts in reiserfs_remount Date: Thu, 26 Jan 2023 11:58:46 +0300 Message-Id: <20230126085846.466209-2-pchelkin@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126085846.466209-1-pchelkin@ispras.ru> References: <20230126085846.466209-1-pchelkin@ispras.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756075528412591800?= X-GMAIL-MSGID: =?utf-8?q?1756075528577146284?= From: Dongliang Mu commit 81dedaf10c20959bdf5624f9783f408df26ba7a4 upstream. Since the commit c3d98ea08291 ("VFS: Don't use save/replace_mount_options if not using generic_show_options") eliminates replace_mount_options in reiserfs_remount, but does not handle the allocated new_opts, it will cause memory leak in the reiserfs_remount. Because new_opts is useless in reiserfs_mount, so we fix this bug by removing the useless new_opts in reiserfs_remount. Fixes: c3d98ea08291 ("VFS: Don't use save/replace_mount_options if not using generic_show_options") Link: https://lore.kernel.org/r/20211027143445.4156459-1-mudongliangabcd@gmail.com Signed-off-by: Dongliang Mu Signed-off-by: Jan Kara Signed-off-by: Fedor Pchelkin --- fs/reiserfs/super.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 58481f8d63d5..f7b05c6b3dcf 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -1437,7 +1437,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) unsigned long safe_mask = 0; unsigned int commit_max_age = (unsigned int)-1; struct reiserfs_journal *journal = SB_JOURNAL(s); - char *new_opts; int err; char *qf_names[REISERFS_MAXQUOTAS]; unsigned int qfmt = 0; @@ -1445,10 +1444,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) int i; #endif - new_opts = kstrdup(arg, GFP_KERNEL); - if (arg && !new_opts) - return -ENOMEM; - sync_filesystem(s); reiserfs_write_lock(s); @@ -1599,7 +1594,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) out_err_unlock: reiserfs_write_unlock(s); out_err: - kfree(new_opts); return err; }