packages: kernel/kernel-grsec_full.patch, kernel/kernel-small_fixes.patch, ...

[arekm]

Author: arekm                        Date: Tue Mar  8 20:38:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update vserver/grsec patches

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.60 -> 1.61) , kernel-small_fixes.patch (1.20 -> 1.21) , kernel-vserver-2.3.patch (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.60 packages/kernel/kernel-grsec_full.patch:1.61
--- packages/kernel/kernel-grsec_full.patch:1.60	Mon Feb 28 09:34:03 2011
+++ packages/kernel/kernel-grsec_full.patch	Tue Mar  8 21:38:28 2011
@@ -33681,18 +33681,6 @@
 diff -urNp linux-2.6.37.2/fs/partitions/ldm.c linux-2.6.37.2/fs/partitions/ldm.c
 --- linux-2.6.37.2/fs/partitions/ldm.c	2011-01-04 19:50:19.000000000 -0500
 +++ linux-2.6.37.2/fs/partitions/ldm.c	2011-02-27 15:47:06.000000000 -0500
-@@ -251,6 +251,11 @@ static bool ldm_parse_vmdb (const u8 *da
- 	}
- 
- 	vm->vblk_size     = get_unaligned_be32(data + 0x08);
-+	if (vm->vblk_size == 0) {
-+		ldm_error ("Illegal VBLK size");
-+		return false;
-+	}
-+
- 	vm->vblk_offset   = get_unaligned_be32(data + 0x0C);
- 	vm->last_vblk_seq = get_unaligned_be32(data + 0x04);
- 
 @@ -1308,7 +1313,7 @@ static bool ldm_frag_add (const u8 *data
  			goto found;
  	}

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.20 packages/kernel/kernel-small_fixes.patch:1.21
--- packages/kernel/kernel-small_fixes.patch:1.20	Mon Feb 28 00:50:31 2011
+++ packages/kernel/kernel-small_fixes.patch	Tue Mar  8 21:38:28 2011
@@ -116,46 +116,4 @@
  	/* block receiver */
  	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
  }
-Subject: [PATCH -mm] swiotlb: fix wrong panic
-From: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-
-swiotlb's map_page wrongly calls panic() when it can't find a buffer
-fit for device's dma mask. It should return an error instead.
-
-Devices with an odd dma mask (i.e. under 4G) like b44 network card hit
-this bug (the system crashes):
-
-http://marc.info/?l=linux-kernel&m=129648943830106&w=2
-
-If swiotlb returns an error, b44 driver can use the own bouncing
-mechanism.
-
-Reported-by: Chuck Ebbert <cebbert at redhat.com>
-Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
-Tested-by: Arkadiusz Miskiewicz <arekm at maven.pl>
-Cc: stable at kernel.org
----
- lib/swiotlb.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index c47bbe1..93ca08b 100644
---- a/lib/swiotlb.c
-+++ b/lib/swiotlb.c
-@@ -686,8 +686,10 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
- 	/*
- 	 * Ensure that the address returned is DMA'ble
- 	 */
--	if (!dma_capable(dev, dev_addr, size))
--		panic("map_single: bounce buffer is not DMA'ble");
-+	if (!dma_capable(dev, dev_addr, size)) {
-+		swiotlb_tbl_unmap_single(dev, map, size, dir);
-+		dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer);
-+	}
- 
- 	return dev_addr;
- }
--- 
-1.7.2.3
-
 

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.56 packages/kernel/kernel-vserver-2.3.patch:1.57
--- packages/kernel/kernel-vserver-2.3.patch:1.56	Mon Feb 28 00:50:31 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Tue Mar  8 21:38:28 2011
@@ -1113,9 +1113,9 @@
 +	if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P))
 +		return -EACCES;
 +
- 	mutex_lock(&loop_mutex);
  	mutex_lock(&lo->lo_ctl_mutex);
  	lo->lo_refcnt++;
+ 	mutex_unlock(&lo->lo_ctl_mutex);
 diff -NurpP --minimal linux-2.6.37/drivers/block/Makefile linux-2.6.37-vs2.3.0.37-rc3/drivers/block/Makefile
 --- linux-2.6.37/drivers/block/Makefile	2011-01-05 21:49:25.000000000 +0100
 +++ linux-2.6.37-vs2.3.0.37-rc3/drivers/block/Makefile	2010-11-23 02:09:41.000000000 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.60&r2=1.61&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.56&r2=1.57&f=u