Commit 9888a588 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds

lib/hexdump.c: return -EINVAL in case of error in hex2bin()

In some cases caller would like to use error code directly without
shadowing.

-EINVAL feels a rightful code to return in case of error in hex2bin().

Link: http://lkml.kernel.org/r/20170731135510.68023-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0f1a45f
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/export.h> #include <linux/export.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
...@@ -42,7 +43,7 @@ EXPORT_SYMBOL(hex_to_bin); ...@@ -42,7 +43,7 @@ EXPORT_SYMBOL(hex_to_bin);
* @src: ascii hexadecimal string * @src: ascii hexadecimal string
* @count: result length * @count: result length
* *
* Return 0 on success, -1 in case of bad input. * Return 0 on success, -EINVAL in case of bad input.
*/ */
int hex2bin(u8 *dst, const char *src, size_t count) int hex2bin(u8 *dst, const char *src, size_t count)
{ {
...@@ -51,7 +52,7 @@ int hex2bin(u8 *dst, const char *src, size_t count) ...@@ -51,7 +52,7 @@ int hex2bin(u8 *dst, const char *src, size_t count)
int lo = hex_to_bin(*src++); int lo = hex_to_bin(*src++);
if ((hi < 0) || (lo < 0)) if ((hi < 0) || (lo < 0))
return -1; return -EINVAL;
*dst++ = (hi << 4) | lo; *dst++ = (hi << 4) | lo;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment