From patchwork Thu Jan 26 16:57:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 137976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A61D1B6F13 for ; Fri, 27 Jan 2012 03:58:31 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RqSdY-0003cI-QO; Thu, 26 Jan 2012 16:57:24 +0000 Received: from utopia.booyaka.com ([72.9.107.138]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RqSdV-0003bZ-Bp for linux-mtd@lists.infradead.org; Thu, 26 Jan 2012 16:57:22 +0000 Received: (qmail 4294 invoked by uid 1019); 26 Jan 2012 16:57:20 -0000 Date: Thu, 26 Jan 2012 09:57:20 -0700 (MST) From: Paul Walmsley To: Joakim Tjernlund Subject: Re: CONFIG_PREEMPT and JFFS2 oops In-Reply-To: Message-ID: References: <4F206213.9070704@flatfrog.com> <4F2127B8.9000005@flatfrog.com> <4F213ED8.2020500@flatfrog.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-mtd@lists.infradead.org" , Richard Purdie , "linux-omap@vger.kernel.org" , David Woodhouse , Orjan Friberg X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org On Thu, 26 Jan 2012, Joakim Tjernlund wrote: > Still leeks: > + best_slen = tdl; > + best_buf = tmp_buf; > + best = this; > > You just throw away best_buf here, don't you? You're right. It's even worse than that. best_buf will contain the data from the last compressor used. And it will be prematurely freed. Here's a fixed version. Time for breakfast. - Paul From: Paul Walmsley Date: Thu, 26 Jan 2012 08:12:09 -0700 Subject: [PATCH v4] fs: jffs2: compression: fix some (but not all) races in jffs2_compress() There is a nasty race in jffs2_compress() when JFFS2_COMPR_MODE_SIZE or JFFS2_COMPR_MODE_FAVOURLZO is selected and multiple jffs2 filesystems are in use. The compressor buffer is shared among all users of the compressor, and the buffer is freed and allocated without holding any lock. This could result in NULL pointer dereferences, or, worse, corrupted data. There doesn't appear to be any point in having a compression buffer shared by all users of the compressor. So remove this, and instead use a buffer that is local to the jffs2_compress() call. This simplifies the locking in this function considerably. There's at least one race left in this function, between it and jffs2_unregister_compressor(). That's left for someone else to fix. Until then, it is suggested that compressors should not be registered or unregistered while any JFFS2 filesystems are mounted. This patch is COMPLETELY UNTESTED. It could easily DESTROY THE FILESYSTEM and CORRUPT DATA, so don't use it unless it's been tested thoroughly and the code has been reviewed by JFFS2 experts. This patch was developed in collaboration with Orjan Friberg and Joakim Tjernlund . Not-signed-off-by: Paul Walmsley Cc: Orjan Friberg Cc: Joakim Tjernlund Cc: Richard Purdie Cc: David Woodhouse --- fs/jffs2/compr.c | 74 ++++++++++++++++++++++++----------------------------- fs/jffs2/compr.h | 2 - 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index 5b6c9d1..77e5091 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c @@ -142,6 +142,9 @@ static int jffs2_selected_compress(u8 compr, unsigned char *data_in, * If the cdata buffer isn't large enough to hold all the uncompressed data, * jffs2_compress should compress as much as will fit, and should set * *datalen accordingly to show the amount of data which were compressed. + * + * Caller must call jffs2_free_comprbuf() after it is done with + * @cpage_out. */ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, unsigned char *data_in, unsigned char **cpage_out, @@ -150,9 +153,9 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, int ret = JFFS2_COMPR_NONE; int mode, compr_ret; struct jffs2_compressor *this, *best=NULL; - unsigned char *output_buf = NULL, *tmp_buf; - uint32_t orig_slen, orig_dlen; + unsigned char *output_buf = NULL, *tmp_buf, *best_buf; uint32_t best_slen=0, best_dlen=0; + uint32_t tdl, tcdl; if (c->mount_opts.override_compr) mode = c->mount_opts.compr; @@ -168,56 +171,49 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, break; case JFFS2_COMPR_MODE_SIZE: case JFFS2_COMPR_MODE_FAVOURLZO: - orig_slen = *datalen; - orig_dlen = *cdatalen; + tmp_buf = kmalloc(*datalen, GFP_KERNEL); + if (!tmp_buf) { + pr_warn("JFFS2: No memory for compressor allocation. (%d bytes)\n", *datalen); + break; + } + best_buf = kmalloc(*datalen, GFP_KERNEL); + if (!best_buf) { + pr_warn("JFFS2: No memory for compressor allocation. (%d bytes)\n", *datalen); + kfree(tmp_buf); + break; + } spin_lock(&jffs2_compressor_list_lock); list_for_each_entry(this, &jffs2_compressor_list, list) { /* Skip decompress-only backwards-compatibility and disabled modules */ if ((!this->compress)||(this->disabled)) continue; - /* Allocating memory for output buffer if necessary */ - if ((this->compr_buf_size < orig_slen) && (this->compr_buf)) { - spin_unlock(&jffs2_compressor_list_lock); - kfree(this->compr_buf); - spin_lock(&jffs2_compressor_list_lock); - this->compr_buf_size=0; - this->compr_buf=NULL; - } - if (!this->compr_buf) { - spin_unlock(&jffs2_compressor_list_lock); - tmp_buf = kmalloc(orig_slen, GFP_KERNEL); - spin_lock(&jffs2_compressor_list_lock); - if (!tmp_buf) { - printk(KERN_WARNING "JFFS2: No memory for compressor allocation. (%d bytes)\n", orig_slen); - continue; - } - else { - this->compr_buf = tmp_buf; - this->compr_buf_size = orig_slen; - } - } this->usecount++; + /* + * XXX This spin_unlock() will cause a race with + * anything that modifies jffs2_compressor_list, + * particularly jffs2_unregister_compressor() + */ spin_unlock(&jffs2_compressor_list_lock); - *datalen = orig_slen; - *cdatalen = orig_dlen; - compr_ret = this->compress(data_in, this->compr_buf, datalen, cdatalen); + tdl = *datalen; + tcdl = *cdatalen; + compr_ret = this->compress(data_in, tmp_buf, &tdl, &tcdl); spin_lock(&jffs2_compressor_list_lock); this->usecount--; - if (!compr_ret) { - if (((!best_dlen) || jffs2_is_best_compression(this, best, *cdatalen, best_dlen)) - && (*cdatalen < *datalen)) { - best_dlen = *cdatalen; - best_slen = *datalen; - best = this; - } + if (compr_ret) + continue; + if ((!best_dlen || jffs2_is_best_compression(this, best, tcdl, best_dlen)) + && (tcdl < tdl)) { + best_dlen = tcdl; + best_slen = tdl; + memcpy(best_buf, tmp_buf, tcdl); + best = this; } } + kfree(tmp_buf); if (best_dlen) { *cdatalen = best_dlen; *datalen = best_slen; - output_buf = best->compr_buf; - best->compr_buf = NULL; - best->compr_buf_size = 0; + output_buf = best_buf; best->stat_compr_blocks++; best->stat_compr_orig_size += best_slen; best->stat_compr_new_size += best_dlen; @@ -302,8 +298,6 @@ int jffs2_register_compressor(struct jffs2_compressor *comp) printk(KERN_WARNING "NULL compressor name at registering JFFS2 compressor. Failed.\n"); return -1; } - comp->compr_buf_size=0; - comp->compr_buf=NULL; comp->usecount=0; comp->stat_compr_orig_size=0; comp->stat_compr_new_size=0; diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h index 5e91d57..fef088a 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h @@ -56,8 +56,6 @@ struct jffs2_compressor { uint32_t cdatalen, uint32_t datalen); int usecount; int disabled; /* if set the compressor won't compress */ - unsigned char *compr_buf; /* used by size compr. mode */ - uint32_t compr_buf_size; /* used by size compr. mode */ uint32_t stat_compr_orig_size; uint32_t stat_compr_new_size; uint32_t stat_compr_blocks;