public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>
Subject: [patch 01/11] fs: Make unload_nls() NULL pointer safe
Date: Fri, 14 Aug 2009 12:42:40 -0000	[thread overview]
Message-ID: <20090814123548.161669222@linutronix.de> (raw)
In-Reply-To: 20090814122657.114987508@linutronix.de

[-- Attachment #1: fs-make-unload-nls-null-pointer-safe.patch --]
[-- Type: text/plain, Size: 706 bytes --]

Most callsites of unload_nls() do 
     if (nls)
	   unload_nls(nls);

Check the pointer inside unload_nls() like we do in kfree() so we can
simplify the call sites.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 fs/nls/nls_base.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6-tip/fs/nls/nls_base.c
===================================================================
--- linux-2.6-tip.orig/fs/nls/nls_base.c
+++ linux-2.6-tip/fs/nls/nls_base.c
@@ -270,7 +270,8 @@ struct nls_table *load_nls(char *charset
 
 void unload_nls(struct nls_table *nls)
 {
-	module_put(nls->owner);
+	if (nls)
+		module_put(nls->owner);
 }
 
 static const wchar_t charset2uni[256] = {



  reply	other threads:[~2009-08-14 12:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-14 12:42 [patch 00/11] Cleanup unload_nls() calls Thomas Gleixner
2009-08-14 12:42 ` Thomas Gleixner [this message]
2009-08-14 12:42 ` [patch 02/11] fat: cleanup fat_put_super() Thomas Gleixner
2009-08-14 13:12   ` OGAWA Hirofumi
2009-08-14 12:42 ` [patch 03/11] befs: cleanup befs_put_super() Thomas Gleixner
2009-08-14 12:42 ` [patch 04/11] cifs: cleanup unload_nls() call Thomas Gleixner
2009-08-14 12:42 ` [patch 05/11] hfs: clenaup unload_nls() calls Thomas Gleixner
2009-08-14 12:43 ` [patch 06/11] hfsplus: cleanup " Thomas Gleixner
2009-08-14 12:43 ` [patch 07/11] isofs: " Thomas Gleixner
2009-08-14 12:43 ` [patch 08/11] jfs: " Thomas Gleixner
2009-08-14 15:17   ` Dave Kleikamp
2009-08-14 12:43 ` [patch 09/11] ncpfs: " Thomas Gleixner
2009-08-14 12:43 ` [patch 10/11] ntfs: " Thomas Gleixner
2009-08-14 12:43 ` [patch 11/11] smbfs: " Thomas Gleixner
2009-08-16 14:46 ` [patch 00/11] Cleanup " Christoph Hellwig
2009-08-16 15:00   ` Thomas Gleixner

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=20090814123548.161669222@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=hch@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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