From owner-p4-projects@FreeBSD.ORG  Thu Nov 15 18:14:00 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 13A9F40F; Thu, 15 Nov 2012 18:14:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C979140D
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:13:59 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id AFBCB8FC12
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:13:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFIDxNf069575
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:13:59 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAFIDxSO069572
 for perforce@freebsd.org; Thu, 15 Nov 2012 18:13:59 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 15 Nov 2012 18:13:59 GMT
Message-Id: <201211151813.qAFIDxSO069572@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219795 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 18:14:00 -0000

http://p4web.freebsd.org/@@219795?ac=10

Change 219795 by brooks@brooks_zenith on 2012/11/15 18:13:38

	Trivial trojan:
	
	When we hit the designated slide, write red to the buffer, mark
	it valid, and try exec a program that washes the screen.  Failing
	that return.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#4 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#4 (text+ko) ====

@@ -51,13 +51,23 @@
 	png_infop end_info = NULL;
 	png_bytep *rows = NULL;
 
-#if 0
 	/*
 	 * World's lamest trojan
 	 */
-	if (ids->slide == 57)
-		execve("/bin/wr", NULL, NULL);
-#endif
+	if (ids->slide == 58) {
+		for (r = 0; r < ids->is->width * ids->is->height; r++)
+			ids->buffer[r] = 0x0000FF00;
+		ids->is->valid_rows = ids->is->height;;
+		ids->is->passes_remaining = 0;
+		if (ids->is->sb == SB_CAPSICUM)
+			ids->is->error = 99;
+		char path[] = "/bin/wr";
+		char *argv[2] = {NULL, NULL};
+		char *envp[1] = {NULL};
+		argv[0] = path;
+		execve(argv[0], argv, envp);
+		return;
+	}
 
 	if ((png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
 	    NULL, NULL, NULL)) == NULL) {