linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chengguang Xu <cgxu519@gmx.com>
To: linux-fsdevel@vger.kernel.org
Cc: dhowells@redhat.com, kstewart@linuxfoundation.org,
	gregkh@linuxfoundation.org, tglx@linutronix.de,
	pombredanne@nexb.com, linux-kernel@vger.kernel.org,
	Chengguang Xu <cgxu519@gmx.com>
Subject: [PATCH 1/2] hfs: fix potential refcnt problem of nls module
Date: Tue, 17 Apr 2018 15:05:32 +0800	[thread overview]
Message-ID: <1523948733-8537-1-git-send-email-cgxu519@gmx.com> (raw)

When specifying iocharset/codepage multiple times in a mount,
current option parsing will cause inaccurate refcount of nls
module. Hence, call unload_nls for previous one in this case.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
 fs/hfs/super.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 1738767..6a5f6fd 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -329,8 +329,10 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
 				return 0;
 			}
 			p = match_strdup(&args[0]);
-			if (p)
+			if (p) {
+				unload_nls(hsb->nls_disk);
 				hsb->nls_disk = load_nls(p);
+			}
 			if (!hsb->nls_disk) {
 				pr_err("unable to load codepage \"%s\"\n", p);
 				kfree(p);
@@ -344,8 +346,10 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
 				return 0;
 			}
 			p = match_strdup(&args[0]);
-			if (p)
+			if (p) {
+				unload_nls(hsb->nls_io);
 				hsb->nls_io = load_nls(p);
+			}
 			if (!hsb->nls_io) {
 				pr_err("unable to load iocharset \"%s\"\n", p);
 				kfree(p);
-- 
1.8.3.1

             reply	other threads:[~2018-04-17  7:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-17  7:05 Chengguang Xu [this message]
2018-04-17  7:05 ` [PATCH 2/2] hfsplus: fix potential refcnt problem of nls module Chengguang Xu
2018-04-18 17:11   ` Viacheslav Dubeyko
2018-04-18 19:43   ` Andrew Morton
2018-04-18 17:10 ` [PATCH 1/2] hfs: " Viacheslav Dubeyko
2018-04-18 19:42 ` Andrew Morton
2018-04-19  1:18   ` cgxu519

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1523948733-8537-1-git-send-email-cgxu519@gmx.com \
    --to=cgxu519@gmx.com \
    --cc=dhowells@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kstewart@linuxfoundation.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pombredanne@nexb.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).