Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a00428d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: GKI: update the abi .xml file due to hex_to_bin() changes



Commit 0f509c44 ("hex2bin: make the function hex_to_bin
constant-time") in 4.19.242 changed the signature of the hex_to_bin()
function to fix a key leak attack vector.  This is not an abi break as
older modules that use the function will still work properly, and the
CRC is preserved, but this resolves any issues going forward as well.

Leaf changes summary: 1 artifact changed (1 filtered out)
Changed leaf types summary: 0 (1 filtered out) leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 1 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

1 function with some sub-type change:

  [C] 'function int hex_to_bin(char)' at hexdump.c:56:1 has some sub-type changes:
    parameter 1 of type 'char' changed:
      type name changed from 'char' to 'unsigned char'
      type size hasn't changed

Fixes: 0f509c44 ("hex2bin: make the function hex_to_bin constant-time")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I26b2283300369049abc831072df9a5ace3e770d1
parent 0ea70774
Loading
Loading
Loading
Loading
+93889 −94895

File changed.

Preview size limit exceeded, changes collapsed.

+4 −0
Original line number Diff line number Diff line
@@ -604,7 +604,11 @@ static inline char *hex_byte_pack_upper(char *buf, u8 byte)
	return buf;
}

#ifdef __GENKSYMS__
extern int hex_to_bin(char ch);
#else
extern int hex_to_bin(unsigned char ch);
#endif
extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
extern char *bin2hex(char *dst, const void *src, size_t count);

+8 −0
Original line number Diff line number Diff line
@@ -46,7 +46,15 @@ EXPORT_SYMBOL(hex_asc_upper);
 *	uppercase and lowercase letters, so we use (ch & 0xdf), which converts
 *	lowercase to uppercase
 */
/*
 * perserve abi due to 15b78a8e38e8 ("hex2bin: make the function hex_to_bin
 * constant-time"
 */
#ifdef __GENKSYMS__
int hex_to_bin(char ch)
#else
int hex_to_bin(unsigned char ch)
#endif
{
	unsigned char cu = ch & 0xdf;
	return -1 +