[kernel] r19804 - in dists/squeeze-security/linux-2.6: . debian debian/patches/bugfix/all debian/patches/bugfix/all/stable debian/patches/bugfix/ia64 debian/patches/bugfix/x86 debian/patches/debian debian/patches/features/all/hpsa debian/patches/features/all/megaraid_sas debian/patches/features/all/openvz debian/patches/features/all/vserver debian/patches/features/x86 debian/patches/features/x86/isci debian/patches/series
Dann Frazier
dannf at alioth.debian.org
Thu Feb 14 05:44:31 UTC 2013
Author: dannf
Date: Thu Feb 14 05:44:30 2013
New Revision: 19804
Log:
back out 2.6.32-47 changes for now; they need more testing
Added:
dists/squeeze-security/linux-2.6/debian/patches/series/46squeeze1
- copied unchanged from r19803, dists/squeeze-security/linux-2.6/debian/patches/series/47squeeze1
Deleted:
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/header-fix-broken-headers-for-user-space.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/kernel-panic-when-mount-NFSv4.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/net-fix-route-cache-rebuilds.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.60.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/staging-fix-usbip-printk-format-warning.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/staging-fix-wlan-ng-printk-format-warning.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/staging-rtl8192e-Use-skb_tail_pointer.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/staging-speakup-fix-printk-format-warning.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/staging-usbip-changed-function-return-type-to-void.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/ia64/revert-pcdp-use-early_ioremap-early_iounmap-to-acces.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/xen-Fix-stack-corruption-in-xen_failsafe_callback-fo.patch
dists/squeeze-security/linux-2.6/debian/patches/bugfix/x86/xen-x86-don-t-corrupt-eip-when-returning-from-a-sign.patch
dists/squeeze-security/linux-2.6/debian/patches/debian/epoll-Avoid-ABI-change-in-file.patch
dists/squeeze-security/linux-2.6/debian/patches/debian/random-Avoid-ABI-change-in-irq_desc.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0080-hpsa-defend-against-zero-sized-buffers-in-passthru-i.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0081-hpsa-fixup-DMA-address-before-freeing.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0082-hpsa-Remove-duplicate-defines-of-DIRECT_LOOKUP_-cons.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0083-hpsa-fix-board-status-waiting-code.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0084-hpsa-Use-kernel-provided-PCI-state-save-and-restore-.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0085-hpsa-limit-commands-allocated-on-reset_devices.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0086-hpsa-do-not-reset-unknown-boards-on-reset_devices.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0087-hpsa-take-the-adapter-lock-in-hpsa_wait_for_mode_cha.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0088-hpsa-allow-driver-to-put-controller-in-either-simple.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0089-hpsa-Add-a-per-controller-commands_outstanding-entry.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0090-hpsa-fix-use-of-uninitialized-variable-in-hpsa_add_m.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0091-hpsa-Fix-problem-that-CMD_UNABORTABLE-command-status.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0092-hpsa-avoid-leaking-stack-contents-to-userland.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0093-hpsa-do-not-re-order-commands-in-internal-queues.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0094-hpsa-make-hpsa.hpsa_simple_mode-1-module-parameter-a.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0095-hpsa-Add-transport_mode-host-attribute-in-sys.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0096-hpsa-Inform-controller-we-are-using-32-bit-tags.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0097-hpsa-Do-not-attempt-kdump-if-we-detect-resetting-con.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0098-hpsa-fix-bad-comparison.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0099-hpsa-fix-incorrect-PCI-IDs-and-add-two-new-ones-2nd-.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0100-hpsa-move-device-attributes-to-avoid-forward-declara.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0101-hpsa-export-resettable-host-attribute.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0102-hpsa-do-readl-after-writel-in-main-i-o-path-to-ensur.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0103-hpsa-add-readl-after-writel-in-interrupt-mask-settin.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0104-hpsa-remove-unused-parameter-from-hpsa_complete_scsi.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0105-hpsa-delete-old-unused-padding-garbage.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0106-hpsa-do-a-better-job-of-detecting-controller-reset-f.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0107-hpsa-wait-longer-for-no-op-to-complete-after-resetti.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0108-hpsa-factor-out-cmd-pool-allocation-functions.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0109-hpsa-factor-out-irq-request-code.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0110-hpsa-increase-time-to-wait-for-board-reset.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0111-hpsa-clarify-messages-around-reset-behavior.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0112-hpsa-remove-atrophied-hpsa_scsi_setup-function.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0113-hpsa-use-new-doorbell-bit-5-reset-method.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0114-hpsa-do-soft-reset-if-hard-reset-is-broken.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0115-hpsa-remove-superfluous-sleeps-around-reset-code.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0116-hpsa-do-not-attempt-PCI-power-management-reset-metho.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0117-hpsa-add-P2000-to-list-of-shared-SAS-devices.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0118-hpsa-Change-memset-using-sizeof-ptr-to-sizeof-ptr.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0119-hpsa-fix-dma-unmap-error-in-hpsa_passthru_ioctl.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0120-hpsa-fix-potential-overrun-while-memcpy-ing-sense-da.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0121-hpsa-do-not-attempt-to-read-from-a-write-only-regist.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0122-hpsa-retry-commands-completing-with-status-of-UNSOLI.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0123-hpsa-fix-problem-that-OBDR-devices-are-not-detected.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0124-hpsa-fix-physical-device-lun-and-target-numbering-pr.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0125-hpsa-change-confusing-message-to-be-more-clear.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0126-hpsa-add-small-delay-when-using-PCI-Power-Management.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0127-hpsa-set-max-sectors-instead-of-taking-the-default.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0128-hpsa-remove-unused-busy_initializing-and-busy_scanni.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0129-hpsa-rename-HPSA_MAX_SCSI_DEVS_PER_HBA.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0130-hpsa-fix-potential-array-overflow-in-hpsa_update_scs.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0131-hpsa-fix-flush-cache-transfer-length.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0132-hpsa-detect-controller-lockup.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0133-hpsa-Disable-ASPM.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0134-hpsa-Fix-problem-with-MSA2xxx-devices.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0135-hpsa-Add-IRQF_SHARED-back-in-for-the-non-MSI-X-inter.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0136-hpsa-fix-handling-of-protocol-error.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0137-hpsa-Use-LUN-reset-instead-of-target-reset.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/hpsa/0138-hpsa-dial-down-lockup-detection-during-firmware-flas.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/megaraid_sas/
dists/squeeze-security/linux-2.6/debian/patches/features/x86/ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
dists/squeeze-security/linux-2.6/debian/patches/features/x86/ALSA-hda-Add-support-for-VMware-controller.patch
dists/squeeze-security/linux-2.6/debian/patches/features/x86/ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
dists/squeeze-security/linux-2.6/debian/patches/features/x86/ALSA-hda-add-Vortex86MX-PCI-ids.patch
dists/squeeze-security/linux-2.6/debian/patches/features/x86/ALSA-hda_intel-ALSA-HD-Audio-patch-for-Intel-Patsbur.patch
dists/squeeze-security/linux-2.6/debian/patches/features/x86/isci/
dists/squeeze-security/linux-2.6/debian/patches/series/47
dists/squeeze-security/linux-2.6/debian/patches/series/47squeeze1
Modified:
dists/squeeze-security/linux-2.6/ (props changed)
dists/squeeze-security/linux-2.6/debian/changelog
dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
Modified: dists/squeeze-security/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/changelog Thu Feb 14 04:41:09 2013 (r19803)
+++ dists/squeeze-security/linux-2.6/debian/changelog Thu Feb 14 05:44:30 2013 (r19804)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.32-47squeeze1) UNRELEASED; urgency=high
+linux-2.6 (2.6.32-46squeeze1) UNRELEASED; urgency=high
* kmod: make __request_module() killable (CVE-2012-4398)
* inet: add RCU protection to inet->opt (CVE-2012-3552)
@@ -12,103 +12,6 @@
-- dann frazier <dannf at debian.org> Mon, 22 Oct 2012 20:34:13 -0500
-linux-2.6 (2.6.32-47) stable; urgency=low
-
- [ Ben Hutchings ]
- * [x86] ALSA: hda_intel: Add device/class IDs for Intel Patsburg,
- Vortex86MX, VMware, Intel Panther Point and other Intel chips
- (Closes: #689928)
- * header: fix broken headers for user space (Closes: #692133)
- * nfsv4: Fix kernel panic when mounting NFSv4 (Closes: #695872)
- * hpsa: Backport changes up to Linux 3.2.35 (Closes: #690100)
- * net: fix route cache rebuilds (Closes: #646063)
- * Add longterm release 2.6.32.60, including:
- - netxen: support for GbE port settings (Closes: #638921)
- - futex: Fix uninterruptible loop due to gate_area
- - time: Improve sanity checking of timekeeping inputs
- - eCryptfs: Copy up lower inode attrs after setting lower xattr
- - eCryptfs: Clear ECRYPTFS_NEW_FILE flag during truncate
- - bonding: 802.3ad - fix agg_device_up
- - usbnet: increase URB reference count before usb_unlink_urb
- - usbnet: don't clear urb->dev in tx_complete
- - xfs: Fix missing xfs_iunlock() on error recovery path in xfs_readlink()
- - nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
- - ntp: Fix integer overflow when setting time
- - ext4: check for zero length extent
- - Bluetooth: add NULL pointer check in HCI
- - Bluetooth: hci_ldisc: fix NULL-pointer dereference on tty_close
- - phonet: Check input from user before allocating
- - netlink: fix races after skb queueing
- - net: fix a race in sock_queue_err_skb()
- - net/ethernet: ks8851_mll fix rx frame buffer overflow
- - NFSv4: Revalidate uid/gid after open (Closes: #659111)
- - ext3: Fix error handling on inode bitmap corruption
- - ext4: fix error handling on inode bitmap corruption
- - SCSI: fix scsi_wait_scan
- - fuse: fix stat call on 32 bit platforms
- - udf: Improve table length check to avoid possible overflow
- - eCryptfs: Properly check for O_RDONLY flag before doing privileged open
- - mm: Hold a file reference in madvise_remove (CVE-2012-3511)
- - SCSI: Avoid dangling pointer in scsi_requeue_command()
- - usbdevfs: Correct amount of data copied to user in processcompl_compat
- - ext4: don't let i_reserved_meta_blocks go negative
- - sctp: Fix list corruption resulting from freeing an association on a list
- - cipso: don't follow a NULL pointer when setsockopt() is called
- - net/tun: fix ioctl() based info leaks
- - futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
- - futex: Fix bug in WARN_ON for NULL q.pi_state
- - futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
- - mm: mmu_notifier: fix freed page still mapped in secondary MMU
- - fuse: verify all ioctl retry iov elements
- - vfs: missed source of ->f_pos races - compat_sys_{read,write}v()
- - NFSv3: Ensure that do_proc_get_root() reports errors correctly
- - Remove user-triggerable BUG from mpol_to_str
- - udf: Fix data corruption for files in ICB
- - ext3: Fix fdatasync() for files with only i_size changes
- - dccp: check ccid before dereferencing
- - [ia64] Add accept4() syscall (Closes: #647825)
- - tcp: drop SYN+FIN messages
- - [x86] amd, xen: Avoid NULL pointer paravirt references
- - [x86] tls: Off by one limit check
- - sparc64: Eliminate obsolete __handle_softirq() function
- - udf: fix retun value on error path in udf_load_logicalvol
- - epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
- - epoll: ep_unregister_pollwait() can use the freed pwq->whead
- - Don't limit non-nested epoll paths
- - epoll: limit paths (CVE-2011-1083)
- - epoll: clear the tfile_check_list on -ELOOP (CVE-2012-3375)
- - random: Improve random number generation on non-interactive systems
- + random: Use arch_get_random_int instead of cycle counter if avail
- + random: Use arch-specific RNG to initialize the entropy store
- + random: make 'add_interrupt_randomness()' do something sane
- + usb: feed USB device information to the /dev/random driver
- + net: feed /dev/random with the MAC address when registering a device
- + rtc: wm831x: Feed the write counter into device_add_randomness()
- + mfd: wm831x: Feed the device UUID into device_add_randomness()
- + dmi: Feed DMI table to /dev/random driver
- For the complete list of changes, see:
- http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.60
- and the bug report which this closes: #698022.
- - [ia64] Revert "pcdp: use early_ioremap/early_iounmap to access pcdp
- table", which breaks compilation of this driver
- * [x86] Don't use the EFI reboot method by default (Closes: #626022)
- * [x86] drm/i915: Attempt to fix watermark setup on 85x (v2)
- (Closes: #661696)
- * [x86] isci: Backport changes up to Linux 3.2.35 (Closes: #698094)
- * [amd64] rtl8192e: Fix transmit on 64-bit architectures (Closes: #698473)
- * [x86] usbip: Fix loss of isochronous packets that require padding
- (Closes: #698474)
- * staging: Fix various log messages that were broken on 64-bit architectures
- (Closes: #698475)
- * [x86] xen/x86: don't corrupt %eip when returning from a signal handler
- * [i386] xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS
- guests. (CVE-2013-0190)
-
- [ Jonathan Nieder ]
- * megaraid_sas: Backport changes up to Linux 3.0.56 (Closes: #666108)
-
- -- Ben Hutchings <ben at decadent.org.uk> Sat, 19 Jan 2013 05:00:07 +0000
-
linux-2.6 (2.6.32-46) stable; urgency=high
[ Bastian Blank ]
Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch Thu Feb 14 04:41:09 2013 (r19803)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch Thu Feb 14 05:44:30 2013 (r19804)
@@ -6541,12 +6541,6 @@
[bwh: Fix context for changes to lease_alloc() after commit
79549c6dfda0603dba9a70a53467ce62d9335c33 ('cred: copy_process() should
clear child->replacement_session_keyring')]
-[bwh: Update definition of struct eventpoll that this moves, to include
- additions in 2.6.32.60]
-[bwh: Fix context for changes to fs/signalfd.c, include/linux/signalfd.h
- and kernel/fork.c following addition of signalfd_cleanup() in 2.6.32.60]
-[bwh: Fix content for changes to do_tcp_sendpages() after 2.6.32.60]
-[bwh: Fix context for changes to struct file after 2.6.32.60]
diff --git a/COPYING.Parallels b/COPYING.Parallels
new file mode 100644
@@ -16581,7 +16575,7 @@
/*
* Structure used to track possible nested calls, for too deep recursions
* and loop cycles.
-@@ -110,88 +106,6 @@ struct nested_calls {
+@@ -110,82 +106,6 @@ struct nested_calls {
spinlock_t lock;
};
@@ -16659,12 +16653,6 @@
-
- /* The user that created the eventpoll descriptor */
- struct user_struct *user;
--
-- struct file *file;
--
-- /* used to optimize loop detection check */
-- int visited;
-- struct list_head visited_list_link;
-};
-
/* Wait structure used by the poll hooks */
@@ -16680,15 +16668,6 @@
/* Used to check for epoll file descriptor inclusion loops */
static struct nested_calls poll_loop_ncalls;
-@@ -286,7 +207,7 @@
- };
- #endif /* CONFIG_SYSCTL */
-
--static const struct file_operations eventpoll_fops;
-+const struct file_operations eventpoll_fops;
-
- static inline int is_file_epoll(struct file *f)
- {
@@ -672,10 +593,11 @@ static unsigned int ep_eventpoll_poll(struct file *file, poll_table *wait)
}
@@ -16700,8 +16679,8 @@
};
+EXPORT_SYMBOL(eventpoll_fops);
- /*
- * This is called from eventpoll_release() to unlink files from the eventpoll
+ /* Fast test to see if the file is an evenpoll file */
+ static inline int is_file_epoll(struct file *f)
@@ -757,7 +679,7 @@ free_uid:
* are protected by the "mtx" mutex, and ep_find() must be called with
* "mtx" held.
@@ -27743,25 +27722,18 @@
index d98bea8..d0c9670 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
-@@ -28,6 +28,7 @@
+@@ -28,10 +28,7 @@
#include <linux/anon_inodes.h>
#include <linux/signalfd.h>
#include <linux/syscalls.h>
-+#include <linux/module.h>
-
- void signalfd_cleanup(struct sighand_struct *sighand)
- {
-@@ -44,10 +44,6 @@
- wake_up_poll(wqh, POLLHUP | POLLFREE);
- }
-
+-
-struct signalfd_ctx {
- sigset_t sigmask;
-};
--
++#include <linux/module.h>
+
static int signalfd_release(struct inode *inode, struct file *file)
{
- kfree(file->private_data);
@@ -201,17 +198,17 @@ static ssize_t signalfd_read(struct file *file, char __user *buf, size_t count,
return total ? total: ret;
}
@@ -33109,7 +33081,7 @@
/* Flags for epoll_create1. */
#define EPOLL_CLOEXEC O_CLOEXEC
-@@ -63,6 +64,106 @@ static inline void eventpoll_init_file(struct file *file)
+@@ -63,6 +64,94 @@ static inline void eventpoll_init_file(struct file *file)
INIT_LIST_HEAD(&file->f_ep_links);
}
@@ -33156,12 +33128,6 @@
+
+ /* The user that created the eventpoll descriptor */
+ struct user_struct *user;
-+
-+ struct file *file;
-+
-+ /* used to optimize loop detection check */
-+ int visited;
-+ struct list_head visited_list_link;
+};
+
+/*
@@ -33201,12 +33167,6 @@
+
+ /* The user that created the eventpoll descriptor */
+ struct user_struct *user;
-+
-+ struct file *file;
-+
-+ /* used to optimize loop detection check */
-+ int visited;
-+ struct list_head visited_list_link;
+};
+
+extern struct semaphore epsem;
@@ -33502,9 +33462,9 @@
unsigned long f_mnt_write_state;
#endif
+ struct ve_struct *owner_env;
- #ifndef __GENKSYMS__
- #ifdef CONFIG_EPOLL
- struct list_head f_tfile_llink;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
@@ -1063,6 +1083,9 @@ struct file_lock {
fl_owner_t fl_owner;
unsigned char fl_flags;
@@ -35632,8 +35592,8 @@
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -60,6 +60,12 @@ static inline void signalfd_notify(struct task_struct *tsk, int sig)
-
- extern void signalfd_cleanup(struct sighand_struct *sighand);
+ wake_up(&tsk->sighand->signalfd_wqh);
+ }
+struct signalfd_ctx {
+ sigset_t sigmask;
@@ -69777,9 +69737,9 @@
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -64,6 +64,8 @@
+ #include <linux/magic.h>
#include <linux/perf_event.h>
#include <linux/posix-timers.h>
- #include <linux/signalfd.h>
+#include <linux/virtinfo.h>
+#include <linux/ve.h>
@@ -85456,7 +85416,7 @@
goto wait_for_memory;
if (can_coalesce) {
-@@ -838,9 +866,14 @@ new_segment:
+@@ -838,10 +866,15 @@ new_segment:
wait_for_sndbuf:
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
wait_for_memory:
@@ -85464,7 +85424,8 @@
+ skb_charge_size(MAX_TCP_HEADER + tp->mss_cache));
+ chargesize = 0;
+wait_for_ubspace:
- tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH);
+ if (copied)
+ tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH);
- if ((err = sk_stream_wait_memory(sk, &timeo)) != 0)
+ err = __sk_stream_wait_memory(sk, &timeo, chargesize);
Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch Thu Feb 14 04:41:09 2013 (r19803)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch Thu Feb 14 05:44:30 2013 (r19804)
@@ -1,6 +1,4 @@
[bwh: Adjust context in drivers/block/Kconfig changed by drbd backport]
-[bwh: Adjust context in fs/ext3/inode.c and kernel/fork.c changed by
- 2.6.32.60]
--- a/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
+++ a/Documentation/scheduler/sched-cfs-hard-limits.txt 2011-06-10 13:03:02.000000000 +0200
@@ -3117,8 +3115,8 @@
+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
int err = 0, rc, block;
- int need_datasync = 0;
- __le32 disksize;
+
+ again:
@@ -2961,29 +2995,32 @@ again:
ext3_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -3156,8 +3154,8 @@
+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
+#endif
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
- disksize = cpu_to_le32(ei->i_disksize);
- if (disksize != raw_inode->i_size) {
+ raw_inode->i_size = cpu_to_le32(ei->i_disksize);
+ raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
@@ -3141,7 +3178,8 @@ int ext3_setattr(struct dentry *dentry,
return error;
@@ -14887,9 +14885,9 @@
--- a/kernel/fork.c 2011-08-08 22:29:45.000000000 +0200
+++ a/kernel/fork.c 2011-06-10 13:03:02.000000000 +0200
@@ -64,6 +64,10 @@
+ #include <linux/magic.h>
#include <linux/perf_event.h>
#include <linux/posix-timers.h>
- #include <linux/signalfd.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
Copied: dists/squeeze-security/linux-2.6/debian/patches/series/46squeeze1 (from r19803, dists/squeeze-security/linux-2.6/debian/patches/series/47squeeze1)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/46squeeze1 Thu Feb 14 05:44:30 2013 (r19804, copy of r19803, dists/squeeze-security/linux-2.6/debian/patches/series/47squeeze1)
@@ -0,0 +1,15 @@
++ bugfix/all/usermodehelper-introduce-umh_complete.patch
++ bugfix/all/usermodehelper-implement-UMH_KILLABLE.patch
++ bugfix/all/usermodehelper-____call_usermodehelper-doesnt-need-do_exit.patch
++ bugfix/all/kmod-introduce-call_modprobe-helper.patch
++ bugfix/all/kmod-make-__request_module-killable.patch
++ bugfix/all/inet-add-RCU-protection-to-inet-opt.patch
++ debian/inet-Avoid-ABI-change-from-fix-for-CVE-2012-3552.patch
++ bugfix/all/net-fix-divide-by-zero-in-tcp-algorithm-illinois.patch
++ bugfix/all/exec-do-not-leave-bprm-interp-on-stack.patch
++ bugfix/all/exec-use-ELOOP-for-max-recursion-depth.patch
++ bugfix/all/ext4-Fix-max-file-size-and-logical-block-counting-of-extent-format-file.patch
+- debian/net-Avoid-ABI-change-from-limit-for-socket-backlog.patch
++ bugfix/all/net-sk_add_backlog-take-remem_alloc-into-account.patch
++ debian/net-Avoid-ABI-change-from-limit-for-socket-backlog-2.patch
++ bugfix/all/ipv6-discard-overlapping-fragment.patch
More information about the Kernel-svn-changes
mailing list