Tue Mar 13 13:22:24 2012 UTC ()
Add patch for CVE-2012-0870.

Bump PKGREVISION.


(taca)
diff -r1.19 -r1.20 pkgsrc/net/samba33/Makefile
diff -r1.8 -r1.9 pkgsrc/net/samba33/distinfo
diff -r0 -r1.1 pkgsrc/net/samba33/patches/patch-smbd_process.c
cvs diff -r1.19 -r1.20 pkgsrc/net/samba33/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba33/Attic/Makefile 2012/02/06 12:41:17 1.19
+++ pkgsrc/net/samba33/Attic/Makefile 2012/03/13 13:22:24 1.20
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.19 2012/02/06 12:41:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2012/03/13 13:22:24 taca Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.samba.org/ 11HOMEPAGE= http://www.samba.org/
12COMMENT= SMB/CIFS protocol server suite 12COMMENT= SMB/CIFS protocol server suite
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15VERSION= 3.3.16 15VERSION= 3.3.16
16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \ 16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* \
17 winbind-[0-9]* 17 winbind-[0-9]*
18MAKE_JOBS_SAFE= NO 18MAKE_JOBS_SAFE= NO
19 19
cvs diff -r1.8 -r1.9 pkgsrc/net/samba33/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/samba33/Attic/distinfo 2011/08/02 14:06:20 1.8
+++ pkgsrc/net/samba33/Attic/distinfo 2012/03/13 13:22:24 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.8 2011/08/02 14:06:20 taca Exp $ 1$NetBSD: distinfo,v 1.9 2012/03/13 13:22:24 taca Exp $
2 2
3SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08 3SHA1 (samba-3.3.16.tar.gz) = bfb06f2cd88ba6c2fb9d25cabf3b22bf1a402f08
4RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011 4RMD160 (samba-3.3.16.tar.gz) = 30e181de0e5399503cad3e09f3dd172a0fc6a011
5Size (samba-3.3.16.tar.gz) = 25566685 bytes 5Size (samba-3.3.16.tar.gz) = 25566685 bytes
6SHA1 (patch-aa) = 35b1e645bd3d023cd8b6ecde383dac290509ca07 6SHA1 (patch-aa) = 35b1e645bd3d023cd8b6ecde383dac290509ca07
7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567 7SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
8SHA1 (patch-ac) = dfddc9fa7f76126e523c7859ac66ce9dd432d732 8SHA1 (patch-ac) = dfddc9fa7f76126e523c7859ac66ce9dd432d732
9SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971 9SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
10SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958 10SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
11SHA1 (patch-af) = 2c668c3bcc2fd90be65ef226acd1fec03dff9a91 11SHA1 (patch-af) = 2c668c3bcc2fd90be65ef226acd1fec03dff9a91
12SHA1 (patch-ag) = ef8421c3d17deeb0a4621ed50a57b51c755fdd1f 12SHA1 (patch-ag) = ef8421c3d17deeb0a4621ed50a57b51c755fdd1f
13SHA1 (patch-ah) = d8603bf8ed0e93070dd9d86cb229d8494fde937b 13SHA1 (patch-ah) = d8603bf8ed0e93070dd9d86cb229d8494fde937b
14SHA1 (patch-ai) = 07619c24084bfa380302a5c215ba5283d7be94a8 14SHA1 (patch-ai) = 07619c24084bfa380302a5c215ba5283d7be94a8
@@ -18,13 +18,14 @@ SHA1 (patch-al) = f347808c376922da057256 @@ -18,13 +18,14 @@ SHA1 (patch-al) = f347808c376922da057256
18SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d 18SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d
19SHA1 (patch-an) = 372cf214a92fa8c2398e1877af36b325d934c514 19SHA1 (patch-an) = 372cf214a92fa8c2398e1877af36b325d934c514
20SHA1 (patch-ao) = 2b926a77906741c3ec0a74e272acea54b5544d74 20SHA1 (patch-ao) = 2b926a77906741c3ec0a74e272acea54b5544d74
21SHA1 (patch-ap) = 91880af078b83bd4dba2de08a3f5f289fbedba77 21SHA1 (patch-ap) = 91880af078b83bd4dba2de08a3f5f289fbedba77
22SHA1 (patch-aq) = 2413ff4756447d21b4144ba02e5e0bdbce8f631a 22SHA1 (patch-aq) = 2413ff4756447d21b4144ba02e5e0bdbce8f631a
23SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a 23SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a
24SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61 24SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61
25SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b 25SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
26SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84 26SHA1 (patch-au) = f94b27a5792acfa3742b4c07b23b3395b73eba84
27SHA1 (patch-av) = e3ebea3cf0a44fc43c8878c1563972ca2c2b60a9 27SHA1 (patch-av) = e3ebea3cf0a44fc43c8878c1563972ca2c2b60a9
28SHA1 (patch-aw) = 8dafe1df0661ce8f662716804cf39516c2499add 28SHA1 (patch-aw) = 8dafe1df0661ce8f662716804cf39516c2499add
29SHA1 (patch-ax) = 86ba06f64069a837b6422f5ea1d7b16bed7915b0 29SHA1 (patch-ax) = 86ba06f64069a837b6422f5ea1d7b16bed7915b0
30SHA1 (patch-lib_replace_test_os2__delete.c) = d4e14bdfb62b51465902f7090b1b2a6a44dc0060 30SHA1 (patch-lib_replace_test_os2__delete.c) = d4e14bdfb62b51465902f7090b1b2a6a44dc0060
 31SHA1 (patch-smbd_process.c) = f12a4224a6a337ceaeac51843eb32c46a71aa7ca
File Added: pkgsrc/net/samba33/patches/Attic/patch-smbd_process.c
$NetBSD: patch-smbd_process.c,v 1.1 2012/03/13 13:22:24 taca Exp $

* Fix for CVE-2012-0870.

--- smbd/process.c.orig	2011-07-24 19:09:38.000000000 +0000
+++ smbd/process.c
@@ -1656,7 +1656,7 @@ void chain_reply(struct smb_request *req
 	int size = smb_len(req->inbuf)+4;
 
 	int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
-	unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
+	static unsigned smb_off2;
 	char *inbuf2;
 	int outsize2;
 	int new_size;
@@ -1681,8 +1681,16 @@ void chain_reply(struct smb_request *req
 		/* this is the first part of the chain */
 		orig_inbuf = inbuf;
 		orig_size = size;
+		smb_off2 = 0;
 	}
 
+	if (SVAL(inbuf,smb_vwv1) <= smb_off2) {
+		DEBUG(1, ("AndX offset not increasing\n"));
+		SCVAL(outbuf, smb_vwv0, 0xFF);
+		return;
+	}
+	smb_off2 = SVAL(inbuf, smb_vwv1);
+
 	/* Validate smb_off2 */
 	if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
 		exit_server_cleanly("Bad chained packet");