linux-kernel - Fwd: [PATCH] Audit: fix handling of 'strings' with NULL characters

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: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <692263700.1702781237470507796.JavaMail.root@zmail07.collab.prod.int.phx2.redhat.com>
Date:	Thu, 19 Mar 2009 09:48:27 -0400 (EDT)
From:	Miloslav Trmac <mitr@...hat.com>
To:	viro@...iv.linux.org.uk
Cc:	akpm@...ux-foundation.org, Steve Grubb <sgrubb@...hat.com>,
	John Dennis <jdennis@...hat.com>, linux-kernel@...r.kernel.org,
	Eric Paris <eparis@...hat.com>
Subject: Fwd: [PATCH] Audit: fix handling of 'strings' with NULL characters

Hello,
this appears to have been lost somewhere...
    Mirek
Return-Path: eparis@...hat.com
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
 zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
 mail02.corp.redhat.com with LMTP; Thu, 11 Sep 2008 17:48:42 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3F86D9061D
	for <mitr@...hat.com>; Thu, 11 Sep 2008 17:48:42 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
	by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id B6FTiTvWG892 for <mitr@...hat.com>;
	Thu, 11 Sep 2008 17:48:42 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 10CB49060A
	for <mitr@...l.corp.redhat.com>; Thu, 11 Sep 2008 17:48:42 -0400 (EDT)
Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m8BLmeNL013040;
	Thu, 11 Sep 2008 17:48:40 -0400
Received: from [10.11.13.208] (vpn-13-208.rdu.redhat.com [10.11.13.208])
	by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id m8BLmdcD003426;
	Thu, 11 Sep 2008 17:48:39 -0400
Subject: [PATCH] Audit: fix handling of 'strings' with NULL characters
From: Eric Paris <eparis@...hat.com>
To: linux-audit@...hat.com, linux-kernel@...r.kernel.org
Cc: viro@...iv.linux.org.uk, jdennis@...hat.com, mitr@...hat.com,
        akpm@...ux-foundation.org, sgrubb@...hat.com
Content-Type: text/plain
Date: Thu, 11 Sep 2008 17:48:39 -0400
Message-Id: <1221169719.2952.14.camel@...alhost.localdomain>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254

currently audit_log_n_untrustedstring() uses
audit_string_contains_control() to check if the 'string' has any control
characters.  If the 'string' has an embedded NULL
audit_string_contains_control() will return that the data has no control
characters and will then pass the string to audit_log_n_string with the
total length, not the length up to the first NULL.  audit_log_n_string
does a memcpy of the entire length and so the actual audit record
emitted may then contain a NULL and then whatever random memory is after
the NULL.

Since we want to log the entire octet stream (if we can't trust the data
to be a string we can't trust that a NULL isn't actually a part of it)
we should just consider NULL as a control character.  If the caller is
certain they want to stop at the first NULL they should be using
audit_log_untrustedstring.

Signed-off-by: Eric Paris <eparis@...hat.com>

---

Miloslav, this is also going to take care of nulls in the TTY_AUDIT_USER
message from userspace.  Is it going to be common to have control
characters on that code path as well?  Do you want to change
audit_receive_msg() to also use the hex encoding directly instead of the
_n_untrustedstring interface?

 kernel/audit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 4414e93..ccb8d68 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1370,7 +1370,7 @@ void audit_log_n_string(struct audit_buffer *ab, const char *string,
 int audit_string_contains_control(const char *string, size_t len)
 {
 	const unsigned char *p;
-	for (p = string; p < (const unsigned char *)string + len && *p; p++) {
+	for (p = string; p < (const unsigned char *)string + len; p++) {
 		if (*p == '"' || *p < 0x21 || *p > 0x7e)
 			return 1;
 	}