* debian/changelog: Update version to 3.5.1-1~experimental-1.
* debian/patches: Remove merged patches. svn path=/dists/trunk/linux/; revision=19323
This commit is contained in:
parent
5a9b375696
commit
c2405c638f
|
@ -1,4 +1,7 @@
|
|||
linux (3.5-1~experimental.2) UNRELEASED; urgency=low
|
||||
linux (3.5.1-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream stable update:
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.5.1
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* genorig: Fix linux_upstream_full compute for version with modifier,
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
From: Jan Kara <jack@suse.cz>
|
||||
Date: Tue, 10 Jul 2012 17:58:04 +0200
|
||||
Subject: udf: Improve table length check to avoid possible overflow
|
||||
|
||||
When a partition table length is corrupted to be close to 1 << 32, the
|
||||
check for its length may overflow on 32-bit systems and we will think
|
||||
the length is valid. Later on the kernel can crash trying to read beyond
|
||||
end of buffer. Fix the check to avoid possible overflow.
|
||||
|
||||
CC: stable@vger.kernel.org
|
||||
Reported-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Signed-off-by: Jan Kara <jack@suse.cz>
|
||||
---
|
||||
fs/udf/super.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/fs/udf/super.c b/fs/udf/super.c
|
||||
index 8a75838..dcbf987 100644
|
||||
--- a/fs/udf/super.c
|
||||
+++ b/fs/udf/super.c
|
||||
@@ -1340,7 +1340,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
|
||||
BUG_ON(ident != TAG_IDENT_LVD);
|
||||
lvd = (struct logicalVolDesc *)bh->b_data;
|
||||
table_len = le32_to_cpu(lvd->mapTableLength);
|
||||
- if (sizeof(*lvd) + table_len > sb->s_blocksize) {
|
||||
+ if (table_len > sb->s_blocksize - sizeof(*lvd)) {
|
||||
udf_err(sb, "error loading logical volume descriptor: "
|
||||
"Partition table too long (%u > %lu)\n", table_len,
|
||||
sb->s_blocksize - sizeof(*lvd));
|
|
@ -1,87 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Wed, 20 Jun 2012 02:19:23 +0100
|
||||
Subject: staging: zsmalloc: Finish conversion to a separate module
|
||||
Bug-Debian: http://bugs.debian.org/677273
|
||||
|
||||
ZSMALLOC is tristate, but the code has no MODULE_LICENSE and since it
|
||||
depends on GPL-only symbols it cannot be loaded as a module. This in
|
||||
turn breaks zram which now depends on it. I assume it's meant to be
|
||||
Dual BSD/GPL like the other z-stuff.
|
||||
|
||||
There is also no module_exit, which makes it impossible to unload.
|
||||
Add the appropriate module_init and module_exit declarations suggested
|
||||
by comments.
|
||||
|
||||
Reported-by: Christian Ohm <chr.ohm@gmx.net>
|
||||
References: http://bugs.debian.org/677273
|
||||
Cc: stable@vger.kernel.org # v3.4
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
drivers/staging/zsmalloc/zsmalloc-main.c | 33 +++++++-----------------------
|
||||
1 file changed, 7 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c
|
||||
index 4496737..8ded9a0 100644
|
||||
--- a/drivers/staging/zsmalloc/zsmalloc-main.c
|
||||
+++ b/drivers/staging/zsmalloc/zsmalloc-main.c
|
||||
@@ -425,12 +425,6 @@ static struct page *find_get_zspage(struct size_class *class)
|
||||
}
|
||||
|
||||
|
||||
-/*
|
||||
- * If this becomes a separate module, register zs_init() with
|
||||
- * module_init(), zs_exit with module_exit(), and remove zs_initialized
|
||||
-*/
|
||||
-static int zs_initialized;
|
||||
-
|
||||
static int zs_cpu_notifier(struct notifier_block *nb, unsigned long action,
|
||||
void *pcpu)
|
||||
{
|
||||
@@ -489,7 +483,7 @@ fail:
|
||||
|
||||
struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
|
||||
{
|
||||
- int i, error, ovhd_size;
|
||||
+ int i, ovhd_size;
|
||||
struct zs_pool *pool;
|
||||
|
||||
if (!name)
|
||||
@@ -516,28 +510,9 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
|
||||
|
||||
}
|
||||
|
||||
- /*
|
||||
- * If this becomes a separate module, register zs_init with
|
||||
- * module_init, and remove this block
|
||||
- */
|
||||
- if (!zs_initialized) {
|
||||
- error = zs_init();
|
||||
- if (error)
|
||||
- goto cleanup;
|
||||
- zs_initialized = 1;
|
||||
- }
|
||||
-
|
||||
pool->flags = flags;
|
||||
pool->name = name;
|
||||
|
||||
- error = 0; /* Success */
|
||||
-
|
||||
-cleanup:
|
||||
- if (error) {
|
||||
- zs_destroy_pool(pool);
|
||||
- pool = NULL;
|
||||
- }
|
||||
-
|
||||
return pool;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(zs_create_pool);
|
||||
@@ -753,3 +728,9 @@ u64 zs_get_total_size_bytes(struct zs_pool *pool)
|
||||
return npages << PAGE_SHIFT;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(zs_get_total_size_bytes);
|
||||
+
|
||||
+module_init(zs_init);
|
||||
+module_exit(zs_exit);
|
||||
+
|
||||
+MODULE_LICENSE("Dual BSD/GPL");
|
||||
+MODULE_AUTHOR("Nitin Gupta <ngupta@vflare.org>");
|
|
@ -50,9 +50,7 @@ features/all/fs-hardlink-creation-restriction-cleanup.patch
|
|||
features/all/wacom/0029-wacom-do-not-request-tablet-data-on-MT-Tablet-PC-pen.patch
|
||||
features/all/wacom/0030-wacom-ignore-new-style-Wacom-multi-touch-packets-on-.patch
|
||||
bugfix/ia64/IA64-Export-asm-cmpxchg.h-to-userland.patch
|
||||
bugfix/x86/zsmalloc-Finish-conversion-to-a-separate-module.patch
|
||||
features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch
|
||||
bugfix/all/udf-Improve-table-length-check-to-avoid-possible-underflow.patch
|
||||
bugfix/all/net-e100-ucode-is-optional-in-some-cases.patch
|
||||
bugfix/x86/drm-i915-prefer-wide-slow-to-fast-narrow-in-DP-confi.patch
|
||||
bugfix/all/hwmon-applesmc-Skip-sensor-mapping.patch
|
||||
|
|
Loading…
Reference in New Issue