diff options
author | Nicolai Stange <nicstange@gmail.com> | 2016-05-26 17:19:54 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-31 04:42:00 -0400 |
commit | cdf24b42c6740ec429e85a8405e5e917abac8595 (patch) | |
tree | 04a20f3b24b3efac01968f554a9eee23f9ba53c5 /lib | |
parent | 7af791e0f0d00c14f01ba2ffe3b6e2b50a35fc6f (diff) |
lib/mpi: mpi_read_from_buffer(): sanitize short buffer printk
The first two bytes of the input buffer encode its expected length and
mpi_read_from_buffer() prints a console message if the given buffer is too
short.
However, there are some oddities with how this message is printed:
- It is printed at the default loglevel. This is different from the
one used in the case that the first two bytes' value is unsupportedly
large, i.e. KERN_INFO.
- The format specifier '%d' is used for unsigned ints.
- It prints the values of nread and *ret_nread. This is redundant since
the former is always the latter + 1.
Clean this up as follows:
- Use pr_info() rather than printk() with no loglevel.
- Use the format specifiers '%u' in place if '%d'.
- Do not print the redundant 'nread' but the more helpful 'nbytes' value.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mpi/mpicoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c index 9c6f6b986682..f4f9e3396f3e 100644 --- a/lib/mpi/mpicoder.c +++ b/lib/mpi/mpicoder.c | |||
@@ -97,8 +97,8 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) | |||
97 | 97 | ||
98 | nbytes = DIV_ROUND_UP(nbits, 8); | 98 | nbytes = DIV_ROUND_UP(nbits, 8); |
99 | if (nbytes + 2 > *ret_nread) { | 99 | if (nbytes + 2 > *ret_nread) { |
100 | printk("MPI: mpi larger than buffer nread=%d ret_nread=%d\n", | 100 | pr_info("MPI: mpi larger than buffer nbytes=%u ret_nread=%u\n", |
101 | *ret_nread + 1, *ret_nread); | 101 | nbytes, *ret_nread); |
102 | return ERR_PTR(-EINVAL); | 102 | return ERR_PTR(-EINVAL); |
103 | } | 103 | } |
104 | 104 | ||