[kernel] r19940 - in dists/trunk/linux: . debian debian/bin debian/config/armel debian/config/ia64 debian/config/kernelarch-mips debian/config/kernelarch-x86 debian/config/mips debian/config/mipsel debian/config/sparc debian/installer/modules debian/patches debian/patches/bugfix/all debian/patches/debian
Ben Hutchings
benh at alioth.debian.org
Sat Mar 23 07:15:52 UTC 2013
Author: benh
Date: Sat Mar 23 07:15:51 2013
New Revision: 19940
Log:
Merge changes from sid up to 3.2.41-1
Drop all changes to backported features and to rt.
Added:
dists/trunk/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch
dists/trunk/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch
dists/trunk/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch
dists/trunk/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch
dists/trunk/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
dists/trunk/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch
- copied unchanged from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch
dists/trunk/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch
dists/trunk/linux/debian/patches/debian/efi-autoload-efivars.patch
- copied, changed from r19938, dists/sid/linux/debian/patches/debian/efi-autoload-efivars.patch
dists/trunk/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch
- copied unchanged from r19938, dists/sid/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch
Modified:
dists/trunk/linux/ (props changed)
dists/trunk/linux/debian/bin/test-patches
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/config/armel/config.versatile
dists/trunk/linux/debian/config/ia64/config
dists/trunk/linux/debian/config/kernelarch-mips/config
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/mips/config
dists/trunk/linux/debian/config/mips/config.4kc-malta
dists/trunk/linux/debian/config/mips/config.5kc-malta
dists/trunk/linux/debian/config/mips/config.r4k-ip22
dists/trunk/linux/debian/config/mips/config.r5k-ip32
dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux/debian/config/mipsel/config
dists/trunk/linux/debian/config/mipsel/config.loongson-2f
dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux/debian/config/sparc/config
dists/trunk/linux/debian/installer/modules/input-modules
dists/trunk/linux/debian/patches/series
dists/trunk/linux/debian/rules.real
Modified: dists/trunk/linux/debian/bin/test-patches
==============================================================================
--- dists/trunk/linux/debian/bin/test-patches Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/bin/test-patches Sat Mar 23 07:15:51 2013 (r19940)
@@ -19,12 +19,15 @@
featureset=none
fi
-eval "set -- $(getopt -n "$0" -- "f:j:s:" "$@")"
+fuzz=0
+
+eval "set -- $(getopt -n "$0" -o "f:j:s:" -l "fuzz:" -- "$@")"
while true; do
case "$1" in
-f) flavour="$2"; shift 2 ;;
-j) export MAKEFLAGS="$MAKEFLAGS -j$2"; shift 2 ;;
-s) featureset="$2"; shift 2 ;;
+ --fuzz) fuzz="$2"; shift 2;;
--) shift 1; break ;;
esac
done
@@ -36,6 +39,7 @@
-f <flavour> specify the 'flavour' of kernel to build, e.g. 686-pae
-j <jobs> specify number of compiler jobs to run in parallel
-s <featureset> specify an optional featureset to apply, e.g. rt
+ --fuzz <num> set the maximum patch fuzz factor (default: 0)
EOF
exit 2
fi
@@ -63,8 +67,9 @@
# Try to clean up any previous test patches
if [ "$featureset" = none ]; then
- while quilt top 2>/dev/null | grep -q ^test/; do
- quilt delete
+ while patch="$(quilt next 2>/dev/null || quilt top 2>/dev/null)" && \
+ [ "${patch#test/}" != "$patch" ]; do
+ quilt delete -r "$patch"
done
else
sed -i '/^test\//d' debian/patches/series-${featureset}
@@ -89,7 +94,7 @@
patch_abs="$(readlink -f "$patch")"
(cd "debian/build/source_${featureset}" && \
quilt import -P "test/$(basename "$patch")" "$patch_abs" && \
- quilt push --fuzz=0)
+ quilt push --fuzz="$fuzz")
done
# Build selected binaries
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/changelog Sat Mar 23 07:15:51 2013 (r19940)
@@ -427,6 +427,156 @@
-- Ben Hutchings <ben at decadent.org.uk> Sun, 04 Mar 2012 20:27:42 +0000
+linux (3.2.41-1) unstable; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.40
+ - ext4: return ENOMEM if sb_getblk() fails
+ - ext4: fix possible use-after-free with AIO
+ - s390/kvm: Fix store status for ACRS/FPRS
+ - staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
+ - ext4: fix race in ext4_mb_add_n_trim()
+ - UBIFS: fix double free of ubifs_orphan objects
+ - hrtimer: Prevent hrtimer_enqueue_reprogram race
+ - nfsd: Fix memleak
+ - x86: Do not leak kernel page mapping locations
+ - USB: usb-storage: unusual_devs update for Super TOP SATA bridge
+ - posix-cpu-timers: Fix nanosleep task_struct leak
+ - NFSv4.1: Don't decode skipped layoutgets
+ - cgroup: fix exit() vs rmdir() race
+ - cpuset: fix cpuset_print_task_mems_allowed() vs rename() race
+ - ext4: fix xattr block allocation/release with bigalloc
+ - mm: fix pageblock bitmap allocation
+ - target: Add missing mapped_lun bounds checking during make_mappedlun
+ setup
+ - b43: Increase number of RX DMA slots
+ - posix-timer: Don't call idr_find() with out-of-range ID
+ - fs: Fix possible use-after-free with AIO
+ - powerpc/kexec: Disable hard IRQ before kexec
+ - mmu_notifier_unregister NULL Pointer deref and multiple ->release()
+ callouts
+ - tmpfs: fix use-after-free of mempolicy object (CVE-2013-1767)
+ - ocfs2: fix possible use-after-free with AIO
+ - ocfs2: fix ocfs2_init_security_and_acl() to initialize acl correctly
+ - ocfs2: ac->ac_allow_chain_relink=0 won't disable group relink
+ - idr: fix a subtle bug in idr_get_next()
+ - idr: make idr_get_next() good for rcu_read_lock()
+ - idr: fix top layer handling
+ - sysctl: fix null checking in bin_dn_node_address()
+ - nbd: fsync and kill block device on shutdown
+ - s390/timer: avoid overflow when programming clock comparator
+ (regression in 3.2.38)
+ - xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}()
+ (CVE-2013-0231)
+ - xen-netback: correctly return errors from netbk_count_requests()
+ - xen-netback: cancel the credit timer when taking the vif down
+ - ipv6: use a stronger hash for tcp
+ - staging: comedi: ni_labpc: correct differential channel sequence for
+ AI commands
+ - staging: comedi: ni_labpc: set up command4 register *after* command3
+ - vhost: fix length for cross region descriptor (CVE-2013-0311)
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.41
+ - NFS: Don't allow NFS silly-renamed files to be deleted, no signal
+ - ARM: VFP: fix emulation of second VFP instruction
+ - md: fix two bugs when attempting to resize RAID0 array.
+ - proc connector: reject unprivileged listener bumps
+ - cifs: ensure that cifs_get_root() only traverses directories
+ - dm: fix truncated status strings
+ - hw_random: make buffer usable in scatterlist. (real fix for #701784)
+ - efi_pstore: Check remaining space with QueryVariableInfo() before
+ writing data
+ - efi: be more paranoid about available space when creating variables
+ (Closes: #703574)
+ - vfs: fix pipe counter breakage
+ - xen/pciback: Don't disable a PCI device that is already disabled.
+ - ALSA: seq: Fix missing error handling in snd_seq_timer_open()
+ - ext3: Fix format string issues (CVE-2013-1848)
+ - keys: fix race with concurrent install_user_keyrings() (CVE-2013-1792)
+ - USB: cdc-wdm: fix buffer overflow (CVE-2013-1860)
+ - signal: always clear sa_restorer on execve (CVE-2013-0914)
+ - crypto: user - fix info leaks in report API (CVE-2013-2546,
+ CVE-2013-2547, CVE-2013-2548)
+ - Fix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and
+ security keys
+ - batman-adv: bat_socket_read missing checks
+ - batman-adv: Only write requested number of byte to user buffer
+ - mm/hotplug: correctly add new zone to all other nodes' zone lists
+ (CVE-2012-5517)
+ - btrfs: use rcu_barrier() to wait for bdev puts at unmount
+
+ [ Aurelien Jarno]
+ * [mips,mipsel] Disable VGA_CONSOLE and ignore the corresponding ABI
+ change. It is completely broken on MIPS.
+ * headers: Include Kbuild.platforms and Platform files in -common to
+ fix out-of-tree building on mips and mipsel.
+ * [{mips,mipsel}/{4,5}kc-malta] Enable HW_RANDOM as module so that both
+ flavours have a consistent configuration.
+
+ [ Ben Hutchings ]
+ * [x86] ata_piix: reenable MS Virtual PC guests (fixes regression in
+ 3.2.19-1)
+ * test-patches: Clean up all previous test patches, whether or not they
+ were applied
+ * test-patches: Add --fuzz option to allow testing patches that have fuzz
+ * [x86] efi: Fix processor-specific memcpy() build error (Closes: #698581)
+ * udeb: Add hid-topseed to input-modules (Closes: #702611)
+ * [x86] drm/i915: Unconditionally initialise the interrupt workers,
+ thanks to Bjørn Mork (Closes: #692607)
+ * efi: Ensure efivars is loaded on EFI systems (Closes: #703363)
+ - [x86] Use a platform device to trigger loading of efivars
+ - [ia64] Change EFI_VARS from module to built-in
+ * efivars: Work around serious firmware bugs
+ - Allow disabling use as a pstore backend
+ - Add module parameter to disable use as a pstore backend
+ * [x86] Set EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+ - explicitly calculate length of VariableName
+ - Handle duplicate names from get_next_variable()
+ * efi_pstore: Introducing workqueue updating sysfs
+ * efivars: pstore: Do not check size when erasing variable
+ * efivars: Remove check for 50% full on write
+ * kmsg_dump: Only dump kernel log in error cases (Closes: #703386)
+ - kexec: remove KMSG_DUMP_KEXEC
+ - kmsg_dump: don't run on non-error paths by default
+ * [x86] i915: initialize CADL in opregion (Closes: #703271)
+ * drm, agp: Update to 3.4.37:
+ - drm/radeon/dce6: fix display powergating
+ - drm: don't add inferred modes for monitors that don't support them
+ - drm/i915: Increase the RC6p threshold.
+ * signal: Fix use of missing sa_restorer field (build regression
+ introduced by fix for CVE-2013-0914)
+ * rds: limit the size allocated by rds_message_alloc()
+ * rtnl: fix info leak on RTM_GETLINK request for VF devices
+ * dcbnl: fix various netlink info leaks
+ * [s390] mm: fix flush_tlb_kernel_range()
+ * [powerpc] Fix cputable entry for 970MP rev 1.0
+ * vhost/net: fix heads usage of ubuf_info
+ * udf: avoid info leak on export (CVE-2012-6548)
+ * isofs: avoid info leak on export (CVE-2012-6549)
+ * [x86,powerpc/powerpc64] random: Change HW_RANDOM back from built-in to
+ module, as we now have a real fix for #701784
+ * [rt] Update to 3.2.40-rt60
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 23 Mar 2013 03:54:34 +0000
+
+linux (3.2.39-2) unstable; urgency=high
+
+ * [s390,s390x] virtio: Ignore ABI changes in 3.2.39 (fixes FTBFS)
+ * [sparc] drm: Ignore ABI changes in 3.2.39 (fixes FTBFS)
+ * [sparc] drm: Change from built-in to module
+ * [rt] Update to 3.2.39-rt59:
+ - acpi/rt: Convert acpi_gbl_hardware lock back to a raw_spinlock_t
+ - printk: Fix rq->lock vs logbuf_lock unlock lock inversion
+ - wait-simple: Simple waitqueue implementation
+ - rcutiny: Use simple waitqueue
+ * [x86] efi: Fix ABI change for introduction of efi_enabled() function
+ in 3.2.38 (Closes: #701690)
+ * [armel/versatile] i2c: Re-enable I2C_PCA_PLATFORM as module, erroneously
+ disabled in 3.2.39-1 (fixes FTBFS)
+ * [x86,powerpc/powerpc64] random: Change HW_RANDOM from module to built-in,
+ to work around virtio-rng bug (Closes: #701784)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 27 Feb 2013 03:48:30 +0000
+
linux (3.2.39-1) unstable; urgency=high
* New upstream stable update:
Modified: dists/trunk/linux/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.versatile Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/armel/config.versatile Sat Mar 23 07:15:51 2013 (r19940)
@@ -154,7 +154,7 @@
##
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
+CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_SIMTEC is not set
CONFIG_I2C_VERSATILE=m
Modified: dists/trunk/linux/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux/debian/config/ia64/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/ia64/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -155,7 +155,8 @@
##
## file: drivers/firmware/Kconfig
##
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
+CONFIG_EFI_VARS_PSTORE=y
CONFIG_DMIID=y
##
Modified: dists/trunk/linux/debian/config/kernelarch-mips/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-mips/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/kernelarch-mips/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -15,6 +15,11 @@
CONFIG_BLK_DEV_SD=y
##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
## file: fs/ext2/Kconfig
##
# CONFIG_EXT2_FS is not set
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -406,6 +406,9 @@
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=y
+#. Runtime-disabled by default
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
Modified: dists/trunk/linux/debian/config/mips/config
==============================================================================
--- dists/trunk/linux/debian/config/mips/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -6,4 +6,3 @@
# CONFIG_CPU_LITTLE_ENDIAN is not set
## end choice
# CONFIG_RAPIDIO is not set
-
Modified: dists/trunk/linux/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.4kc-malta Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.4kc-malta Sat Mar 23 07:15:51 2013 (r19940)
@@ -199,6 +199,11 @@
CONFIG_APPLICOM=m
##
+## file: drivers/char/hw_random/Kconfig
+##
+CONFIG_HW_RANDOM=m
+
+##
## file: drivers/char/ipmi/Kconfig
##
CONFIG_IPMI_HANDLER=m
@@ -1018,8 +1023,6 @@
##
## file: drivers/video/console/Kconfig
##
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FONTS is not set
Modified: dists/trunk/linux/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.5kc-malta Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.5kc-malta Sat Mar 23 07:15:51 2013 (r19940)
@@ -202,6 +202,11 @@
CONFIG_APPLICOM=m
##
+## file: drivers/char/hw_random/Kconfig
+##
+CONFIG_HW_RANDOM=m
+
+##
## file: drivers/char/ipmi/Kconfig
##
CONFIG_IPMI_HANDLER=m
@@ -1022,8 +1027,6 @@
##
## file: drivers/video/console/Kconfig
##
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FONTS is not set
Modified: dists/trunk/linux/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r4k-ip22 Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.r4k-ip22 Sat Mar 23 07:15:51 2013 (r19940)
@@ -441,7 +441,6 @@
##
## file: drivers/video/console/Kconfig
##
-# CONFIG_VGA_CONSOLE is not set
# CONFIG_MDA_CONSOLE is not set
CONFIG_SGI_NEWPORT_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
Modified: dists/trunk/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r5k-ip32 Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.r5k-ip32 Sat Mar 23 07:15:51 2013 (r19940)
@@ -557,7 +557,6 @@
##
## file: drivers/video/console/Kconfig
##
-# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
Modified: dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Sat Mar 23 07:15:51 2013 (r19940)
@@ -702,7 +702,6 @@
##
## file: drivers/video/console/Kconfig
##
-# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
Modified: dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Sat Mar 23 07:15:51 2013 (r19940)
@@ -708,7 +708,6 @@
##
## file: drivers/video/console/Kconfig
##
-# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
Modified: dists/trunk/linux/debian/config/mipsel/config
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mipsel/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -5,4 +5,3 @@
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_LITTLE_ENDIAN=y
## end choice
-
Modified: dists/trunk/linux/debian/config/mipsel/config.loongson-2f
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.loongson-2f Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mipsel/config.loongson-2f Sat Mar 23 07:15:51 2013 (r19940)
@@ -126,6 +126,5 @@
##
## file: drivers/video/console/Kconfig
##
-# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
Modified: dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Sat Mar 23 07:15:51 2013 (r19940)
@@ -672,11 +672,6 @@
CONFIG_FB_COBALT=m
##
-## file: drivers/video/console/Kconfig
-##
-# CONFIG_VGA_CONSOLE is not set
-
-##
## file: drivers/w1/Kconfig
##
# CONFIG_W1 is not set
Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/config/sparc/config Sat Mar 23 07:15:51 2013 (r19940)
@@ -68,7 +68,7 @@
##
## file: drivers/gpu/drm/Kconfig
##
-CONFIG_DRM=y
+CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
Modified: dists/trunk/linux/debian/installer/modules/input-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/input-modules Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/installer/modules/input-modules Sat Mar 23 07:15:51 2013 (r19940)
@@ -20,5 +20,6 @@
hid-samsung ?
hid-speedlink ?
hid-sunplus ?
+hid-topseed ?
synaptics_usb ?
wistron_btns ?
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -25,24 +25,15 @@
Signed-off-by: Seiji Aguchi <seiji.aguchi at hds.com>
Acked-by: Matt Fleming <matt.fleming at intel.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
-[bwh: Backported to 3.2:
- - Adjust contest
- - Don't check reason in efi_pstore_write(), as it is not given as a
- parameter
- - Move up declaration of __efivars]
+[bwh: Backported to 3.8: adjust context]
---
+ drivers/firmware/efivars.c | 85 +++++++++++++++++++++++++++++++++++++++++---
+ include/linux/efi.h | 3 +-
+ 2 files changed, 82 insertions(+), 6 deletions(-)
+
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -128,6 +128,8 @@ struct efivar_attribute {
- ssize_t (*store)(struct efivar_entry *entry, const char *buf, size_t count);
- };
-
-+static struct efivars __efivars;
-+
- #define PSTORE_EFI_ATTRIBUTES \
- (EFI_VARIABLE_NON_VOLATILE | \
- EFI_VARIABLE_BOOTSERVICE_ACCESS | \
-@@ -152,6 +154,13 @@ efivar_create_sysfs_entry(struct efivars
+@@ -165,6 +165,13 @@ efivar_create_sysfs_entry(struct efivars
efi_char16_t *variable_name,
efi_guid_t *vendor_guid);
@@ -56,20 +47,21 @@
/* Return the number of unicode characters in data */
static unsigned long
utf16_strnlen(efi_char16_t *s, size_t maxlength)
-@@ -834,11 +843,7 @@ static int efi_pstore_write(enum pstore_
- if (found)
- efivar_unregister(found);
+@@ -1428,11 +1435,8 @@ static int efi_pstore_write(enum pstore_
+
+ spin_unlock_irqrestore(&efivars->lock, flags);
- if (size)
- ret = efivar_create_sysfs_entry(efivars,
- utf16_strsize(efi_name,
- DUMP_NAME_LEN * 2),
- efi_name, &vendor);
-+ schedule_work(&efivar_work);
++ if (reason == KMSG_DUMP_OOPS)
++ schedule_work(&efivar_work);
*id = part;
return ret;
-@@ -1017,6 +1022,75 @@ static ssize_t efivar_delete(struct file
+@@ -1670,6 +1674,75 @@ static ssize_t efivar_delete(struct file
return count;
}
@@ -145,15 +137,7 @@
/*
* Let's not leave out systab information that snuck into
* the efivars driver
-@@ -1273,7 +1347,6 @@ out:
- }
- EXPORT_SYMBOL_GPL(register_efivars);
-
--static struct efivars __efivars;
- static struct efivar_operations ops;
-
- /*
-@@ -1331,6 +1404,8 @@ err_put:
+@@ -2000,6 +2073,8 @@ err_put:
static void __exit
efivars_exit(void)
{
@@ -164,7 +148,7 @@
kobject_put(efi_kobj);
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
-@@ -620,7 +620,8 @@ struct efivars {
+@@ -740,7 +740,8 @@ struct efivars {
* 1) ->list - adds, removals, reads, writes
* 2) ops.[gs]et_variable() calls.
* It must not be held when creating sysfs entries or calling kmalloc.
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -22,12 +22,13 @@
Cc: Seiji Aguchi <seiji.aguchi at hds.com>
Cc: Tony Luck <tony.luck at intel.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
-[bwh: Backported to 3.2: adjust context]
---
drivers/firmware/Kconfig | 9 +++++++++
drivers/firmware/efivars.c | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
+diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
+index 898023d..42c759a 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -62,6 +62,15 @@ config EFI_VARS_PSTORE
@@ -46,11 +47,13 @@
config EFI_PCDP
bool "Console device selection via EFI PCDP or HCDP table"
depends on ACPI && EFI && IA64
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index 37b6f24..6607daf 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -93,6 +93,11 @@ MODULE_ALIAS("platform:efivars");
-
- #define DUMP_NAME_LEN 52
+@@ -103,6 +103,11 @@ MODULE_VERSION(EFIVARS_VERSION);
+ */
+ #define GUID_LEN 36
+static bool efivars_pstore_disable =
+ IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE);
@@ -60,7 +63,7 @@
/*
* The maximum size of VariableName + Data = 1024
* Therefore, it's reasonable to save that much
-@@ -1258,7 +1263,8 @@ int register_efivars(struct efivars *efi
+@@ -2009,7 +2014,8 @@ int register_efivars(struct efivars *efivars,
if (error)
unregister_efivars(efivars);
@@ -68,5 +71,5 @@
+ if (!efivars_pstore_disable)
+ efivar_pstore_register(efivars);
- out:
- kfree(variable_name);
+ register_filesystem(&efivarfs_type);
+
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -17,12 +17,13 @@
Cc: Seiji Aguchi <seiji.aguchi at hds.com>
Cc: Tony Luck <tony.luck at intel.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
-[bwh: Backported to 3.2: adjust context]
---
drivers/firmware/Kconfig | 9 +++++++
drivers/firmware/efivars.c | 64 ++++++++++++++------------------------------
2 files changed, 29 insertions(+), 44 deletions(-)
+diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
+index 9b00072..898023d 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -53,6 +53,15 @@ config EFI_VARS
@@ -41,27 +42,22 @@
config EFI_PCDP
bool "Console device selection via EFI PCDP or HCDP table"
depends on ACPI && EFI && IA64
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index fe62aa3..37b6f24 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -660,8 +660,6 @@ static struct kobj_type efivar_ktype = {
- .default_attrs = def_attrs,
+@@ -1309,9 +1309,7 @@ static const struct inode_operations efivarfs_dir_inode_operations = {
+ .create = efivarfs_create,
};
-static struct pstore_info efi_pstore_info;
-
- static inline void
- efivar_unregister(struct efivar_entry *var)
- {
-@@ -698,7 +696,7 @@ static int efi_status_to_err(efi_status_
- return err;
- }
-
-#ifdef CONFIG_PSTORE
+#ifdef CONFIG_EFI_VARS_PSTORE
static int efi_pstore_open(struct pstore_info *psi)
{
-@@ -848,36 +846,6 @@ static int efi_pstore_erase(enum pstore_
+@@ -1514,38 +1512,6 @@ static int efi_pstore_erase(enum pstore_type_id type, u64 id, int count,
return 0;
}
@@ -76,21 +72,23 @@
- return 0;
-}
-
--static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
+-static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, int *count,
- struct timespec *timespec,
- char **buf, struct pstore_info *psi)
-{
- return -1;
-}
-
--static int efi_pstore_write(enum pstore_type_id type, u64 *id,
-- unsigned int part, size_t size, struct pstore_info *psi)
+-static int efi_pstore_write(enum pstore_type_id type,
+- enum kmsg_dump_reason reason, u64 *id,
+- unsigned int part, int count, size_t size,
+- struct pstore_info *psi)
-{
- return 0;
-}
-
--static int efi_pstore_erase(enum pstore_type_id type, u64 id,
-- struct pstore_info *psi)
+-static int efi_pstore_erase(enum pstore_type_id type, u64 id, int count,
+- struct timespec time, struct pstore_info *psi)
-{
- return 0;
-}
@@ -98,7 +96,7 @@
static struct pstore_info efi_pstore_info = {
.owner = THIS_MODULE,
-@@ -889,6 +857,24 @@ static struct pstore_info efi_pstore_inf
+@@ -1557,6 +1523,24 @@ static struct pstore_info efi_pstore_info = {
.erase = efi_pstore_erase,
};
@@ -123,7 +121,7 @@
static ssize_t efivar_create(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t count)
-@@ -1272,15 +1258,7 @@ int register_efivars(struct efivars *efi
+@@ -2025,15 +2009,7 @@ int register_efivars(struct efivars *efivars,
if (error)
unregister_efivars(efivars);
@@ -138,5 +136,5 @@
- }
+ efivar_pstore_register(efivars);
- out:
- kfree(variable_name);
+ register_filesystem(&efivarfs_type);
+
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -13,8 +13,8 @@
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -94,7 +94,7 @@ MODULE_ALIAS("platform:efivars");
- #define DUMP_NAME_LEN 52
+@@ -105,7 +105,7 @@ MODULE_ALIAS("platform:efivars");
+ #define GUID_LEN 36
static bool efivars_pstore_disable =
- IS_ENABLED(EFI_VARS_PSTORE_DEFAULT_DISABLE);
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -70,14 +70,15 @@
Tested-by: Lingzhu Xiang <lxiang at redhat.com>
Cc: Seiji Aguchi <seiji.aguchi at hds.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
-[bwh: Backported to 3.2: reason is not checked in efi_pstore_write()]
---
drivers/firmware/efivars.c | 48 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index 1e9d9b9..d64661f 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -160,6 +160,7 @@ efivar_create_sysfs_entry(struct efivars
+@@ -170,6 +170,7 @@ efivar_create_sysfs_entry(struct efivars *efivars,
static void efivar_update_sysfs_entries(struct work_struct *);
static DECLARE_WORK(efivar_work, efivar_update_sysfs_entries);
@@ -85,17 +86,16 @@
/* Return the number of unicode characters in data */
static unsigned long
-@@ -843,7 +844,8 @@ static int efi_pstore_write(enum pstore_
- if (found)
- efivar_unregister(found);
-
-- schedule_work(&efivar_work);
-+ if (efivar_wq_enabled)
-+ schedule_work(&efivar_work);
+@@ -1444,7 +1445,7 @@ static int efi_pstore_write(enum pstore_type_id type,
+
+ spin_unlock_irqrestore(&efivars->lock, flags);
+
+- if (reason == KMSG_DUMP_OOPS)
++ if (reason == KMSG_DUMP_OOPS && efivar_wq_enabled)
+ schedule_work(&efivar_work);
*id = part;
- return ret;
-@@ -1306,6 +1308,35 @@ void unregister_efivars(struct efivars *
+@@ -1975,6 +1976,35 @@ void unregister_efivars(struct efivars *efivars)
}
EXPORT_SYMBOL_GPL(unregister_efivars);
@@ -131,7 +131,7 @@
int register_efivars(struct efivars *efivars,
const struct efivar_operations *ops,
struct kobject *parent_kobj)
-@@ -1348,6 +1379,22 @@ int register_efivars(struct efivars *efi
+@@ -2025,6 +2055,22 @@ int register_efivars(struct efivars *efivars,
case EFI_SUCCESS:
variable_name_size = var_name_strnsize(variable_name,
variable_name_size);
Copied: dists/trunk/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch Sat Mar 23 07:15:51 2013 (r19940, copy of r19938, dists/sid/linux/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch)
@@ -0,0 +1,101 @@
+From: Matt Fleming <matt.fleming at intel.com>
+Date: Fri, 1 Mar 2013 14:49:12 +0000
+Subject: efivars: explicitly calculate length of VariableName
+
+commit ec50bd32f1672d38ddce10fb1841cbfda89cfe9a upstream.
+
+It's not wise to assume VariableNameSize represents the length of
+VariableName, as not all firmware updates VariableNameSize in the same
+way (some don't update it at all if EFI_SUCCESS is returned). There
+are even implementations out there that update VariableNameSize with
+values that are both larger than the string returned in VariableName
+and smaller than the buffer passed to GetNextVariableName(), which
+resulted in the following bug report from Michael Schroeder,
+
+ > On HP z220 system (firmware version 1.54), some EFI variables are
+ > incorrectly named :
+ >
+ > ls -d /sys/firmware/efi/vars/*8be4d* | grep -v -- -8be returns
+ > /sys/firmware/efi/vars/dbxDefault-pport8be4df61-93ca-11d2-aa0d-00e098032b8c
+ > /sys/firmware/efi/vars/KEKDefault-pport8be4df61-93ca-11d2-aa0d-00e098032b8c
+ > /sys/firmware/efi/vars/SecureBoot-pport8be4df61-93ca-11d2-aa0d-00e098032b8c
+ > /sys/firmware/efi/vars/SetupMode-Information8be4df61-93ca-11d2-aa0d-00e098032b8c
+
+The issue here is that because we blindly use VariableNameSize without
+verifying its value, we can potentially read garbage values from the
+buffer containing VariableName if VariableNameSize is larger than the
+length of VariableName.
+
+Since VariableName is a string, we can calculate its size by searching
+for the terminating NULL character.
+
+Reported-by: Frederic Crozat <fcrozat at suse.com>
+Cc: Matthew Garrett <mjg59 at srcf.ucam.org>
+Cc: Josh Boyer <jwboyer at redhat.com>
+Cc: Michael Schroeder <mls at suse.com>
+Cc: Lee, Chun-Yi <jlee at suse.com>
+Cc: Lingzhu Xiang <lxiang at redhat.com>
+Cc: Seiji Aguchi <seiji.aguchi at hds.com>
+Signed-off-by: Matt Fleming <matt.fleming at intel.com>
+---
+ drivers/firmware/efivars.c | 32 +++++++++++++++++++++++++++++++-
+ 1 file changed, 31 insertions(+), 1 deletion(-)
+
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -1044,6 +1044,31 @@ static bool variable_is_present(efi_char
+ return found;
+ }
+
++/*
++ * Returns the size of variable_name, in bytes, including the
++ * terminating NULL character, or variable_name_size if no NULL
++ * character is found among the first variable_name_size bytes.
++ */
++static unsigned long var_name_strnsize(efi_char16_t *variable_name,
++ unsigned long variable_name_size)
++{
++ unsigned long len;
++ efi_char16_t c;
++
++ /*
++ * The variable name is, by definition, a NULL-terminated
++ * string, so make absolutely sure that variable_name_size is
++ * the value we expect it to be. If not, return the real size.
++ */
++ for (len = 2; len <= variable_name_size; len += sizeof(c)) {
++ c = variable_name[(len / sizeof(c)) - 1];
++ if (!c)
++ break;
++ }
++
++ return min(len, variable_name_size);
++}
++
+ static void efivar_update_sysfs_entries(struct work_struct *work)
+ {
+ struct efivars *efivars = &__efivars;
+@@ -1084,10 +1109,13 @@ static void efivar_update_sysfs_entries(
+ if (!found) {
+ kfree(variable_name);
+ break;
+- } else
++ } else {
++ variable_name_size = var_name_strnsize(variable_name,
++ variable_name_size);
+ efivar_create_sysfs_entry(efivars,
+ variable_name_size,
+ variable_name, &vendor);
++ }
+ }
+ }
+
+@@ -1318,6 +1346,8 @@ int register_efivars(struct efivars *efi
+ &vendor_guid);
+ switch (status) {
+ case EFI_SUCCESS:
++ variable_name_size = var_name_strnsize(variable_name,
++ variable_name_size);
+ efivar_create_sysfs_entry(efivars,
+ variable_name_size,
+ variable_name,
Copied and modified: dists/trunk/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch (from r19938, dists/sid/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -19,7 +19,7 @@
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
-@@ -234,7 +234,8 @@ static void handle_tx(struct vhost_net *
+@@ -339,7 +339,8 @@ static void handle_tx(struct vhost_net *
msg.msg_controllen = 0;
ubufs = NULL;
} else {
@@ -27,5 +27,5 @@
+ struct ubuf_info *ubuf;
+ ubuf = vq->ubuf_info + vq->upend_idx;
- vq->heads[vq->upend_idx].len = len;
- ubuf->callback = vhost_zerocopy_callback;
+ vq->heads[vq->upend_idx].len =
+ VHOST_DMA_IN_PROGRESS;
Copied and modified: dists/trunk/linux/debian/patches/debian/efi-autoload-efivars.patch (from r19938, dists/sid/linux/debian/patches/debian/efi-autoload-efivars.patch)
==============================================================================
--- dists/sid/linux/debian/patches/debian/efi-autoload-efivars.patch Sat Mar 23 03:56:59 2013 (r19938, copy source)
+++ dists/trunk/linux/debian/patches/debian/efi-autoload-efivars.patch Sat Mar 23 07:15:51 2013 (r19940)
@@ -15,7 +15,7 @@
---
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
-@@ -38,6 +38,7 @@
+@@ -41,6 +41,7 @@
#include <linux/io.h>
#include <linux/reboot.h>
#include <linux/bcd.h>
@@ -23,8 +23,8 @@
#include <asm/setup.h>
#include <asm/efi.h>
-@@ -612,6 +613,20 @@ void __init efi_init(void)
- #endif
+@@ -762,6 +763,20 @@ void __init efi_late_init(void)
+ efi_bgrt_init();
}
+#ifdef CONFIG_EFI_VARS_MODULE
@@ -46,7 +46,7 @@
u64 addr, npages;
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
-@@ -89,6 +89,7 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@
+@@ -94,6 +94,7 @@ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@
MODULE_DESCRIPTION("sysfs interface to EFI Variables");
MODULE_LICENSE("GPL");
MODULE_VERSION(EFIVARS_VERSION);
Copied: dists/trunk/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch (from r19938, dists/sid/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch Sat Mar 23 07:15:51 2013 (r19940, copy of r19938, dists/sid/linux/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: efivars: Remove check for 50% full on write
+Date: Sat, 23 Mar 2013 02:18:42 +0000
+
+On my EFI-booting system (AMI firmware/Asus board), the firmware does
+not garbage-collect the variable store until it is rather more than
+50% full, and it also updates a variable at every boot. This check
+means that variable writes are guaranteed to fail after the system has
+booted more than a few hundred times.
+
+Since pstore integration is now disabled by default in Debian, we will
+not normally write that much data before rebooting and giving the
+firmware a chance to garbage-collect the variable store. Therefore,
+until the check can be restricted to known-bad systems, it seems less
+risky to disable it for now.
+
+---
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -439,8 +439,7 @@ check_var_size_locked(struct efivars *ef
+ if (status != EFI_SUCCESS)
+ return status;
+
+- if (!storage_size || size > remaining_size || size > max_size ||
+- (remaining_size - size) < (storage_size / 2))
++ if (!storage_size || size > remaining_size || size > max_size)
+ return EFI_OUT_OF_RESOURCES;
+
+ return status;
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/patches/series Sat Mar 23 07:15:51 2013 (r19940)
@@ -79,3 +79,12 @@
bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch
bugfix/all/signal-fix-use-of-missing-sa_restorer-field.patch
bugfix/all/kernel-signal.c-use-__ARCH_HAS_SA_RESTORER-instead-o.patch
+debian/efi-autoload-efivars.patch
+bugfix/all/vhost-net-fix-heads-usage-of-ubuf_info.patch
+bugfix/all/efivars-Allow-disabling-use-as-a-pstore-backend.patch
+bugfix/all/efivars-Add-module-parameter-to-disable-use-as-a-pst.patch
+bugfix/all/efivars-Fix-check-for-CONFIG_EFI_VARS_PSTORE_DEFAULT.patch
+bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch
+bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch
+bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
+debian/efivars-remove-check-for-50-full-on-write.patch
Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real Sat Mar 23 06:47:20 2013 (r19939)
+++ dists/trunk/linux/debian/rules.real Sat Mar 23 07:15:51 2013 (r19940)
@@ -234,6 +234,8 @@
echo Makefile; \
find arch/$(KERNEL_ARCH) -maxdepth 1 -name 'Makefile*' -print; \
find arch/$(KERNEL_ARCH) -name 'module.lds' -print; \
+ find arch/$(KERNEL_ARCH)/Kbuild.platforms -print; \
+ find arch/$(KERNEL_ARCH) -name 'Platform' -print; \
find $$(find arch/$(KERNEL_ARCH) \( -name include -o -name scripts \) -type d -print) -print; \
find include -print; \
) \
More information about the Kernel-svn-changes
mailing list