[PATCH] crypto, xor: Sanitize checksumming function selection output

[PATCH] crypto, xor: Sanitize checksumming function selection output

[Borislav Petkov]

From: Borislav Petkov <borislav.petkov@amd.com>

Currently, it says

[    1.015541] xor: automatically using best checksumming function: generic_sse
[    1.040769]    generic_sse:  6679.000 MB/sec
[    1.045377] xor: using function: generic_sse (6679.000 MB/sec)

and repeats the function name three times unnecessarily. Change it into

[    1.015115] xor: automatically using best checksumming function:
[    1.040794]    generic_sse:  6680.000 MB/sec

and save us a line in dmesg.

No functional change.

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
 crypto/xor.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/xor.c b/crypto/xor.c
index b75182d8ab14..664b6dfa9e2c 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -129,9 +129,9 @@ calibrate_xor_blocks(void)
 
 	if (fastest) {
 		printk(KERN_INFO "xor: automatically using best "
-			"checksumming function: %s\n",
-			fastest->name);
+				 "checksumming function:\n");
 		xor_speed(fastest);
+		goto out;
 	} else {
 		printk(KERN_INFO "xor: measuring software checksum speed\n");
 		XOR_TRY_TEMPLATES;
@@ -146,6 +146,7 @@ calibrate_xor_blocks(void)
 
 #undef xor_speed
 
+ out:
 	free_pages((unsigned long)b1, 2);
 
 	active_template = fastest;
-- 
1.7.9.3.362.g71319

Re: [PATCH] crypto, xor: Sanitize checksumming function selection output

[Herbert Xu]

On Wed, Apr 04, 2012 at 03:06:10PM +0200, Borislav Petkov wrote:
> From: Borislav Petkov <borislav.petkov@amd.com>
> 
> Currently, it says
> 
> [    1.015541] xor: automatically using best checksumming function: generic_sse
> [    1.040769]    generic_sse:  6679.000 MB/sec
> [    1.045377] xor: using function: generic_sse (6679.000 MB/sec)
> 
> and repeats the function name three times unnecessarily. Change it into
> 
> [    1.015115] xor: automatically using best checksumming function:
> [    1.040794]    generic_sse:  6680.000 MB/sec
> 
> and save us a line in dmesg.
> 
> No functional change.
> 
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

Patch applied.  Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt