From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-security-module@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
David Safford <safford@watson.ibm.com>,
"Nicholas A. Bellinger" <nab@linux-iscsi.org>,
target-devel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC][PATCH 2/5] lib: add error checking to hex2bin
Date: Fri, 16 Sep 2011 08:50:27 -0400 [thread overview]
Message-ID: <1316177430-13167-2-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1316177430-13167-1-git-send-email-zohar@linux.vnet.ibm.com>
hex2bin converts a hexadecimal string to its binary representation.
The original version of hex2bin did not do any error checking. This
patch adds error checking and returns the result.
Changelog:
- use the new unpack_hex_byte()
- add __must_check compiler option (Andy Shevchenko's suggestion)
- change function API to return error checking result
(based on Tetsuo Handa's initial patch)
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
include/linux/kernel.h | 2 +-
lib/hexdump.c | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d8ea13b..3021e64 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -382,7 +382,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
}
extern int hex_to_bin(char ch);
-extern void hex2bin(u8 *dst, const char *src, size_t count);
+extern bool __must_check hex2bin(u8 *dst, const char *src, size_t count);
/*
* unpack_hex_byte - convert 2 asii hex digits into a byte
diff --git a/lib/hexdump.c b/lib/hexdump.c
index f5fe6ba..7711095 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -38,14 +38,17 @@ EXPORT_SYMBOL(hex_to_bin);
* @dst: binary result
* @src: ascii hexadecimal string
* @count: result length
+ *
+ * Returns true on success, false in case of bad input.
*/
-void hex2bin(u8 *dst, const char *src, size_t count)
+bool hex2bin(u8 *dst, const char *src, size_t count)
{
while (count--) {
- *dst = hex_to_bin(*src++) << 4;
- *dst += hex_to_bin(*src++);
- dst++;
+ if (!unpack_hex_byte(dst++, src))
+ return false;
+ src += 2;
}
+ return true;
}
EXPORT_SYMBOL(hex2bin);
--
1.7.3.4
next prev parent reply other threads:[~2011-09-16 12:51 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 12:50 [RFC][PATCH 1/5] lib: add unpack_hex_byte() Mimi Zohar
2011-09-16 12:50 ` Mimi Zohar [this message]
2011-09-16 13:13 ` [RFC][PATCH 2/5] lib: add error checking to hex2bin Andy Shevchenko
2011-09-19 21:20 ` Andrew Morton
2011-09-16 12:50 ` [RFC][PATCH 3/5] trusted-keys: check hex2bin result Mimi Zohar
2011-09-16 12:50 ` [RFC][PATCH 4/5] encrypted-keys: " Mimi Zohar
2011-09-16 12:50 ` [RFC][PATCH 5/5] target: " Mimi Zohar
2011-09-16 14:07 ` Tetsuo Handa
2011-09-16 20:21 ` Nicholas A. Bellinger
2011-09-19 11:19 ` Mimi Zohar
2011-09-16 13:11 ` [RFC][PATCH 1/5] lib: add unpack_hex_byte() Andy Shevchenko
2011-09-19 21:19 ` Andrew Morton
2011-09-19 22:35 ` Mimi Zohar
2011-09-19 22:38 ` Andrew Morton
2011-09-20 6:04 ` Andy Shevchenko
2011-09-20 6:26 ` Andrew Morton
2011-09-23 10:47 ` [PATCH 1/2] kernel.h: rename pack_hex_byte to hex_pack_byte Andy Shevchenko
2011-09-23 10:47 ` [PATCH 2/2] wireless: at76c50x: use native hex_pack_byte() method Andy Shevchenko
2011-09-27 11:51 ` [PATCHv2] " Andy Shevchenko
2011-09-27 12:01 ` [PATCHv2.1] " Andy Shevchenko
2011-09-23 20:18 ` [PATCH 1/2] kernel.h: rename pack_hex_byte to hex_pack_byte Andrew Morton
2011-09-27 10:51 ` Andy Shevchenko
2011-09-27 17:32 ` Andrew Morton
2011-10-10 14:33 ` [PATCHv2 1/5] lib: rename pack_hex_byte to hex_byte_pack Andy Shevchenko
2011-10-10 14:33 ` [PATCHv2 2/5] kgdb: follow " Andy Shevchenko
2011-10-10 14:55 ` Jesper Nilsson
2011-10-10 14:33 ` [PATCHv2 3/5] security: " Andy Shevchenko
2011-10-10 14:33 ` [PATCHv2 4/5] fat: " Andy Shevchenko
2011-10-10 20:02 ` OGAWA Hirofumi
2011-10-10 14:33 ` [PATCHv2 5/5] wireless: at76c50x: " Andy Shevchenko
2011-10-11 13:55 ` John W. Linville
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=1316177430-13167-2-git-send-email-zohar@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=andy.shevchenko@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=safford@watson.ibm.com \
--cc=target-devel@vger.kernel.org \
/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).