Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759429AbXIZDhE (ORCPT ); Tue, 25 Sep 2007 23:37:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759646AbXIZDeG (ORCPT ); Tue, 25 Sep 2007 23:34:06 -0400 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:35507 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759910AbXIZDeD (ORCPT ); Tue, 25 Sep 2007 23:34:03 -0400 From: Erez Zadok To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, viro@ftp.linux.org.uk, hch@infradead.org, Erez Zadok , "Josef 'Jeff' Sipek" Subject: [PATCH 25/25] Unionfs: use poison.h for safe poison pointers Date: Tue, 25 Sep 2007 23:10:04 -0400 Message-Id: <11907762153804-git-send-email-ezk@cs.sunysb.edu> X-Mailer: git-send-email 1.5.2.2 X-MailKey: Erez_Zadok In-Reply-To: <11907762042481-git-send-email-ezk@cs.sunysb.edu> References: <11907762042481-git-send-email-ezk@cs.sunysb.edu> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3249 Lines: 94 This also fixes a compile warning on 64-bit systems. Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Erez Zadok --- fs/unionfs/debug.c | 16 ++++++---------- fs/unionfs/union.h | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index 09b52ce..b103eb9 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -25,14 +25,6 @@ } \ } while (0) -#if BITS_PER_LONG == 32 -#define POISONED_PTR ((void*) 0x5a5a5a5a) -#elif BITS_PER_LONG == 64 -#define POISONED_PTR ((void*) 0x5a5a5a5a5a5a5a5a) -#else -#error Unknown BITS_PER_LONG value -#endif /* BITS_PER_LONG != known */ - /* * __unionfs_check_{inode,dentry,file} perform exhaustive sanity checking on * the fan-out of various Unionfs objects. We check that no lower objects @@ -50,6 +42,7 @@ void __unionfs_check_inode(const struct inode *inode, struct inode *lower_inode; struct super_block *sb; int printed_caller = 0; + void *poison_ptr; /* for inodes now */ BUG_ON(!inode); @@ -88,12 +81,13 @@ void __unionfs_check_inode(const struct inode *inode, } lower_inode = unionfs_lower_inode_idx(inode, bindex); if (lower_inode) { + memset(&poison_ptr, POISON_INUSE, sizeof(void *)); if (unlikely(bindex < istart || bindex > iend)) { PRINT_CALLER(fname, fxn, line); printk(" Ci5: inode/linode=%p:%p bindex=%d " "istart/end=%d:%d\n", inode, lower_inode, bindex, istart, iend); - } else if (unlikely(lower_inode == POISONED_PTR)) { + } else if (unlikely(lower_inode == poison_ptr)) { /* freed inode! */ PRINT_CALLER(fname, fxn, line); printk(" Ci6: inode/linode=%p:%p bindex=%d " @@ -131,6 +125,7 @@ void __unionfs_check_dentry(const struct dentry *dentry, struct super_block *sb; struct vfsmount *lower_mnt; int printed_caller = 0; + void *poison_ptr; BUG_ON(!dentry); sb = dentry->d_sb; @@ -257,12 +252,13 @@ void __unionfs_check_dentry(const struct dentry *dentry, for (bindex = sbstart(sb); bindex < sbmax(sb); bindex++) { lower_inode = unionfs_lower_inode_idx(inode, bindex); if (lower_inode) { + memset(&poison_ptr, POISON_INUSE, sizeof(void *)); if (unlikely(bindex < istart || bindex > iend)) { PRINT_CALLER(fname, fxn, line); printk(" CI5: dentry/linode=%p:%p bindex=%d " "istart/end=%d:%d\n", dentry, lower_inode, bindex, istart, iend); - } else if (unlikely(lower_inode == POISONED_PTR)) { + } else if (unlikely(lower_inode == poison_ptr)) { /* freed inode! */ PRINT_CALLER(fname, fxn, line); printk(" CI6: dentry/linode=%p:%p bindex=%d " diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h index 8df44a9..510267f 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include -- 1.5.2.2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/