lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1345336551-10066-1-git-send-email-jim.cromie@gmail.com>
Date:	Sat, 18 Aug 2012 18:35:51 -0600
From:	Jim Cromie <jim.cromie@...il.com>
To:	torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org
Cc:	gregkh@...ux-foundation.org, Jim Cromie <jim.cromie@...il.com>,
	Markus Trippelsdorf <markus@...ppelsdorf.de>
Subject: [PATCH] dyndbg: fix for SOH in logging messages

commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.

Bisected and fixed by Markus Trippelsdorf.

CC: Markus Trippelsdorf <markus@...ppelsdorf.de>
Signed-off-by: Jim Cromie <jim.cromie@...il.com>
---
 drivers/base/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index cdd01c5..5e6e00b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
 				    "DEVICE=+%s:%s", subsys, dev_name(dev));
 	}
 skip:
-	if (level[3])
-		level_extra = &level[3]; /* skip past "<L>" */
+	if (level[2])
+		level_extra = &level[2]; /* skip past KERN_SOH "L" */
 
 	return printk_emit(0, level[1] - '0',
 			   dictlen ? dict : NULL, dictlen,
-- 
1.7.10.1.487.ga3935e6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ