[PATCH 1/6] fs/adfs: Add printf format/argument verification and fix fallout

From: Joe Perches
Date: Wed Nov 10 2010 - 18:47:40 EST


Add __attribute__ ((format(printf, 3, 4))) to __adfs_error prototype
Change format string to match argument in adfs_dir_lookup_byname

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
fs/adfs/adfs.h | 1 +
fs/adfs/dir.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 2ff622f..fa078f1 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -129,6 +129,7 @@ extern int adfs_map_lookup(struct super_block *sb, unsigned int frag_id, unsigne
extern unsigned int adfs_map_free(struct super_block *sb);

/* Misc */
+__attribute__ ((format(printf, 3, 4)))
void __adfs_error(struct super_block *sb, const char *function,
const char *fmt, ...);
#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index f4287e4..6b74978 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -148,7 +148,7 @@ adfs_dir_lookup_byname(struct inode *inode, struct qstr *name, struct object_inf
goto out;

if (ADFS_I(inode)->parent_id != dir.parent_id) {
- adfs_error(sb, "parent directory changed under me! (%lx but got %lx)\n",
+ adfs_error(sb, "parent directory changed under me! (%lx but got %x)\n",
ADFS_I(inode)->parent_id, dir.parent_id);
ret = -EIO;
goto free_out;
--
1.7.3.1.g432b3.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/