Author: baggins Date: Wed May 4 11:23:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- removed hunks present in 2.6.38.5 patch
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.69 -> 1.70)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.69
packages/kernel/kernel-grsec_full.patch:1.70
--- packages/kernel/kernel-grsec_full.patch:1.69 Sat Apr 23 11:14:12 2011
+++ packages/kernel/kernel-grsec_full.patch Wed May 4 13:22:56 2011
@@ -24334,67 +24334,6 @@
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.38.4/drivers/char/agp/generic.c
linux-2.6.38.4/drivers/char/agp/generic.c
---- linux-2.6.38.4/drivers/char/agp/generic.c 2011-03-14 21:20:32.000000000
-0400
-+++ linux-2.6.38.4/drivers/char/agp/generic.c 2011-04-22 19:37:16.000000000
-0400
-@@ -115,6 +115,9 @@ static struct agp_memory *agp_create_use
- struct agp_memory *new;
- unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
-
-+ if (INT_MAX/sizeof(struct page *) < num_agp_pages)
-+ return NULL;
-+
- new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
- if (new == NULL)
- return NULL;
-@@ -234,11 +237,14 @@ struct agp_memory *agp_allocate_memory(s
- int scratch_pages;
- struct agp_memory *new;
- size_t i;
-+ int cur_memory;
-
- if (!bridge)
- return NULL;
-
-- if ((atomic_read(&bridge->current_memory_agp) + page_count) >
bridge->max_memory_agp)
-+ cur_memory = atomic_read(&bridge->current_memory_agp);
-+ if ((cur_memory + page_count > bridge->max_memory_agp) ||
-+ (cur_memory + page_count < page_count))
- return NULL;
-
- if (type >= AGP_USER_TYPES) {
-@@ -1089,8 +1095,8 @@ int agp_generic_insert_memory(struct agp
- return -EINVAL;
- }
-
-- /* AK: could wrap */
-- if ((pg_start + mem->page_count) > num_entries)
-+ if (((pg_start + mem->page_count) > num_entries) ||
-+ ((pg_start + mem->page_count) < pg_start))
- return -EINVAL;
-
- j = pg_start;
-@@ -1124,7 +1130,7 @@ int agp_generic_remove_memory(struct agp
- {
- size_t i;
- struct agp_bridge_data *bridge;
-- int mask_type;
-+ int mask_type, num_entries;
-
- bridge = mem->bridge;
- if (!bridge)
-@@ -1136,6 +1142,11 @@ int agp_generic_remove_memory(struct agp
- if (type != mem->type)
- return -EINVAL;
-
-+ num_entries = agp_num_entries();
-+ if (((pg_start + mem->page_count) > num_entries) ||
-+ ((pg_start + mem->page_count) < pg_start))
-+ return -EINVAL;
-+
- mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
- if (mask_type != 0) {
- /* The generic routines know nothing of memory types */
diff -urNp linux-2.6.38.4/drivers/char/agp/intel-agp.c
linux-2.6.38.4/drivers/char/agp/intel-agp.c
--- linux-2.6.38.4/drivers/char/agp/intel-agp.c 2011-03-14
21:20:32.000000000 -0400
+++ linux-2.6.38.4/drivers/char/agp/intel-agp.c 2011-04-17
15:57:32.000000000 -0400
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
