aboutsummaryrefslogtreecommitdiffstats
path: root/mm/kasan
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-03-17 17:19:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 18:09:34 -0400
commit756a025f00091918d9d09ca3229defb160b409c0 (patch)
treed4a6914597ef4b10870a7983bb61cd595e7094a2 /mm/kasan
parent598d80914e84fa79580850530f5d4a50a99bf4f5 (diff)
mm: coalesce split strings
Kernel style prefers a single string over split strings when the string is 'user-visible'. Miscellanea: - Add a missing newline - Realign arguments Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Tejun Heo <tj@kernel.org> [percpu] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kasan')
-rw-r--r--mm/kasan/report.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 12f222d0224b..745aa8f36028 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -214,8 +214,7 @@ static void kasan_report_error(struct kasan_access_info *info)
214 */ 214 */
215 kasan_disable_current(); 215 kasan_disable_current();
216 spin_lock_irqsave(&report_lock, flags); 216 spin_lock_irqsave(&report_lock, flags);
217 pr_err("=================================" 217 pr_err("==================================================================\n");
218 "=================================\n");
219 if (info->access_addr < 218 if (info->access_addr <
220 kasan_shadow_to_mem((void *)KASAN_SHADOW_START)) { 219 kasan_shadow_to_mem((void *)KASAN_SHADOW_START)) {
221 if ((unsigned long)info->access_addr < PAGE_SIZE) 220 if ((unsigned long)info->access_addr < PAGE_SIZE)
@@ -236,8 +235,7 @@ static void kasan_report_error(struct kasan_access_info *info)
236 print_address_description(info); 235 print_address_description(info);
237 print_shadow_for_address(info->first_bad_addr); 236 print_shadow_for_address(info->first_bad_addr);
238 } 237 }
239 pr_err("=================================" 238 pr_err("==================================================================\n");
240 "=================================\n");
241 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); 239 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
242 spin_unlock_irqrestore(&report_lock, flags); 240 spin_unlock_irqrestore(&report_lock, flags);
243 kasan_enable_current(); 241 kasan_enable_current();