Linux 2.6.22.10
Subsystems (8)
We (the -stable team) are announcing the release of the 2.6.22.10 kernel. It fixes a number of reported bugs, and any user of the 2.6.22 series is encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.22.9 and 2.6.22.10
The updated 2.6.22.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.22.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.22.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 - arch/i386/kernel/apic.c | 10 ++--- arch/i386/kernel/cpu/amd.c | 7 +++ drivers/ata/libata-core.c | 13 +++++- drivers/i2c/algos/i2c-algo-bit.c | 52 +++++++++++++++++---------- drivers/net/ppp_mppe.c | 14 +++---- drivers/net/sky2.c | 71 ++++++++++++++++++++++---------------- drivers/net/sky2.h | 2 - drivers/scsi/scsi_transport_spi.c | 28 +++++++++++--- fs/lockd/svclock.c | 31 ++++++++++------ include/asm-i386/apic.h | 2 + include/asm-i386/cpufeature.h | 2 - kernel/sys.c | 2 + kernel/time/timer_stats.c | 5 +- security/selinux/hooks.c | 3 + 15 files changed, 156 insertions(+), 88 deletions(-)
Summary of changes from v2.6.22.9 to v2.6.22.10
===============================================
Andi Kleen (1):
i386: Use global flag to disable broken local apic timer on AMD CPUs.
Anton Blanchard (1):
Fix timer_stats printout of events/sec
Chuck Ebbert (1):
libata: update drive blacklists
David Brownell (1):
i2c-algo-bit: Read block data bugfix
Greg Kroah-Hartman (1):
Linux 2.6.22.10
James Bottomley (1):
scsi_transport_spi: fix domain validation failure from incorrect width setting
Mark Lord (1):
Fix SMP poweroff hangs
Michal Schmidt (1):
Fix ppp_mppe kernel stack usage.
Stephen Hemminger (3):
sky2: reduce impact of watchdog timer
sky2: fix VLAN receive processing
sky2: fix transmit state on resume
Stephen Smalley (1):
SELinux: clear parent death signal on SID transitions
Trond Myklebust (2):
NLM: Fix a circular lock dependency in lockd
NLM: Fix a memory leak in nlmsvc_testlock
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 22 -EXTRAVERSION = .9 +EXTRAVERSION = .10 NAME = Holy Dancing Manatees, Batman! # *DOCUMENTATION*
arch/i386/kernel/apic.c +4 -6
@@ -61,8 +61,9 @@ static int enable_local_apic __initdata = 0;/* Local APIC timer verification ok */ static int local_apic_timer_verify_ok; -/* Disable local APIC timer from the kernel commandline or via dmi quirk */ -static int local_apic_timer_disabled; +/* Disable local APIC timer from the kernel commandline or via dmi quirk +or using CPU MSR check */ +int local_apic_timer_disabled;/* Local APIC timer works in C2 */ int local_apic_timer_c2_ok;EXPORT_SYMBOL_GPL (local_apic_timer_c2_ok);
@@ -367,12 +368,9 @@ void __init setup_boot_APIC_clock(void)long delta, deltapm;int pm_referenced =0 ; -if (boot_cpu_has (X86_FEATURE_LAPIC_TIMER_BROKEN )) - local_apic_timer_disabled =1 ; -/* * The local apic timer can be disabled via the kernel -* commandline or from the test above. Register the lapic +* commandline or from the CPU detection code. Register the lapic * timer as a dummy clock event source on SMP systems, so the * broadcast mechanism is used. On UP systems simply ignore it. */
arch/i386/kernel/cpu/amd.c +6 -1
@@ -3,6 +3,7 @@#include <linux/mm.h> #include <asm/io.h> #include <asm/processor.h> +#include <asm/apic.h> #include "cpu.h"
@@ -22,6 +23,7 @@extern void vide (void ); __asm__(".align 4\nvide: ret" ); +#ifdef CONFIG_X86_LOCAL_APIC #define ENABLE_C1E_MASK 0x18000000#define CPUID_PROCESSOR_SIGNATURE 1#define CPUID_XFAM 0x0ff00000
@@ -52,6 +54,7 @@ static __cpuinit int amd_apic_timer_broken(void) }return 0 ; } +#endif int force_mwait__cpuinitdata ;
@@ -275,8 +278,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)if (cpuid_eax (0x80000000 ) >=0x80000006 ) num_cache_leaves =3 ; +#ifdef CONFIG_X86_LOCAL_APIC if (amd_apic_timer_broken ()) -set_bit (X86_FEATURE_LAPIC_TIMER_BROKEN , c->x86_capability); + local_apic_timer_disabled =1 ; +#endif if (c->x86 ==0x10 && !force_mwait)clear_bit (X86_FEATURE_MWAIT , c->x86_capability);
drivers/ata/libata-core.c +11 -2
@@ -3774,6 +3774,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SAMSUNG CD-ROM SN-124","N001", ATA_HORKAGE_NODMA }, { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA }, { "IOMEGA ZIP 250 ATAPI", NULL, ATA_HORKAGE_NODMA }, /* temporary fix */ + { "IOMEGA ZIP 250 ATAPI Floppy", + NULL, ATA_HORKAGE_NODMA },/* Weird ATAPI devices */ { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 },
@@ -3787,7 +3789,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "FUJITSU MHT2060BH", NULL, ATA_HORKAGE_NONCQ },/* NCQ is broken */ { "Maxtor 6L250S0", "BANC1G10", ATA_HORKAGE_NONCQ }, + { "Maxtor 6B200M0", "BANC1BM0", ATA_HORKAGE_NONCQ }, { "Maxtor 6B200M0", "BANC1B10", ATA_HORKAGE_NONCQ }, + { "Maxtor 7B250S0", "BANC1B70", ATA_HORKAGE_NONCQ, }, + { "Maxtor 7B300S0", "BANC1B70", ATA_HORKAGE_NONCQ }, + { "Maxtor 7V300F0", "VA111630", ATA_HORKAGE_NONCQ }, + { "HITACHI HDS7250SASUN500G 0621KTAWSD", "K2AOAJ0AHITACHI", + ATA_HORKAGE_NONCQ },/* NCQ hard hangs device under heavier load, needs hard power cycle */ { "Maxtor 6B250S0", "BANC1B70", ATA_HORKAGE_NONCQ },/* Blacklist entries taken from Silicon Image 3124/3132
@@ -3801,8 +3809,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, }, { "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, }, { "FUJITSU MHV2080BH", "00840028", ATA_HORKAGE_NONCQ, }, - - /* Devices with NCQ limits */ + { "ST9160821AS", "3.CLF", ATA_HORKAGE_NONCQ, }, + { "ST3160812AS", "3.AD", ATA_HORKAGE_NONCQ, }, + { "SAMSUNG HD401LJ", "ZZ100-15", ATA_HORKAGE_NONCQ, }, /* End Marker */ { }
drivers/i2c/algos/i2c-algo-bit.c +32 -20
79 lines not on this page · raw message
drivers/net/ppp_mppe.c +6 -8
@@ -136,7 +136,7 @@ struct ppp_mppe_state {* Key Derivation, from RFC 3078, RFC 3079. * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079. */ -static void get_new_key_from_sha (struct ppp_mppe_state * state,unsigned char *InterimKey) +static void get_new_key_from_sha (struct ppp_mppe_state * state) {struct hash_desc desc;struct scatterlist sg[4 ];
@@ -153,8 +153,6 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I desc.flags =0 ;crypto_hash_digest (&desc, sg, nbytes, state->sha1_digest); - -memcpy (InterimKey, state->sha1_digest, state->keylen); }/*
@@ -163,21 +161,21 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I*/ static void mppe_rekey (struct ppp_mppe_state * state,int initial_key) { -unsigned char InterimKey[MPPE_MAX_KEY_LEN ];struct scatterlist sg_in[1 ], sg_out[1 ];struct blkcipher_desc desc = { .tfm = state->arc4 }; -get_new_key_from_sha (state, InterimKey); +get_new_key_from_sha (state);if (!initial_key) { -crypto_blkcipher_setkey (state->arc4, InterimKey, state->keylen); -setup_sg (sg_in, InterimKey, state->keylen); +crypto_blkcipher_setkey (state->arc4, state->sha1_digest, + state->keylen); +setup_sg (sg_in, state->sha1_digest, state->keylen);setup_sg (sg_out, state->session_key, state->keylen);if (crypto_blkcipher_encrypt (&desc, sg_out, sg_in, state->keylen) !=0 ) {printk (KERN_WARNING "mppe_rekey: cipher_encrypt failed\n" ); } }else { -memcpy (state->session_key, InterimKey, state->keylen); +memcpy (state->session_key, state->sha1_digest, state->keylen); }if (state->keylen ==8 ) {/* See RFC 3078 */
drivers/net/sky2.c +42 -29
164 lines not on this page · raw message
drivers/net/sky2.h +1 -1
@@ -1921,7 +1921,7 @@ struct sky2_hw {u32 st_idx;dma_addr_t st_dma; -struct timer_list idle_timer; +struct timer_list watchdog_timer;struct work_struct restart_work;int msi;wait_queue_head_t msi_wait;
drivers/scsi/scsi_transport_spi.c +22 -6
@@ -787,10 +787,12 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)struct scsi_target *starget = sdev->sdev_target;struct Scsi_Host *shost = sdev->host;int len = sdev->inquiry_len; +int min_period =spi_min_period (starget); +int max_width =spi_max_width (starget);/* first set us up for narrow async */ DV_SET (offset,0 );DV_SET (width,0 ); - +if (spi_dv_device_compare_inquiry (sdev, buffer, buffer,DV_LOOPS ) !=SPI_COMPARE_SUCCESS ) {starget_printk (KERN_ERR , starget,"Domain Validation Initial Inquiry Failed\n" );
@@ -798,9 +800,13 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)return ; } +if (!scsi_device_wide (sdev)) { +spi_max_width (starget) =0 ; + max_width =0 ; + } +/* test width */ -if (i->f->set_width &&spi_max_width (starget) && -scsi_device_wide (sdev)) { +if (i->f->set_width && max_width) { i->f->set_width (starget,1 ); if (spi_dv_device_compare_inquiry(sdev, buffer,
@@ -809,6 +815,11 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer) != SPI_COMPARE_SUCCESS) {starget_printk (KERN_ERR , starget,"Wide Transfers Fail\n" ); i->f->set_width (starget,0 ); +/* Make sure we don't force wide back on by asking +* for a transfer period that requires it */ + max_width =0 ; +if (min_period <10 ) + min_period =10 ; } }
@@ -828,7 +839,8 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)/* now set up to the maximum */ DV_SET (offset,spi_max_offset (starget)); -DV_SET (period,spi_min_period (starget)); +DV_SET (period, min_period); +/* try QAS requests; this should be harmless to set if the * target supports it */ if (scsi_device_qas (sdev)) {
@@ -837,14 +849,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)DV_SET (qas,0 ); } -if (scsi_device_ius (sdev) &&spi_min_period (starget) <9 ) { +if (scsi_device_ius (sdev) && min_period <9 ) {/* This u320 (or u640). Set IU transfers */ DV_SET (iu,1 );/* Then set the optional parameters */ DV_SET (rd_strm,1 );DV_SET (wr_flow,1 );DV_SET (rti,1 ); -if (spi_min_period (starget) ==8 ) +if (min_period ==8 )DV_SET (pcomp_en,1 ); }else {DV_SET (iu,0 );
@@ -862,6 +874,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer) }else {DV_SET (dt,1 ); } +/* set width last because it will pull all the other +* parameters down to required values */ +DV_SET (width, max_width); +/* Do the read only INQUIRY tests */ spi_dv_retrain (sdev, buffer, buffer + sdev->inquiry_len, spi_dv_device_compare_inquiry);
fs/lockd/svclock.c +20 -11
@@ -171,19 +171,14 @@ found:* GRANTED_RES message by cookie, without having to rely on the client's IP * address. --okir */ -static inline struct nlm_block * -nlmsvc_create_block (struct svc_rqst *rqstp,struct nlm_file *file, -struct nlm_lock *lock,struct nlm_cookie *cookie) +static struct nlm_block * +nlmsvc_create_block (struct svc_rqst *rqstp,struct nlm_host *host, +struct nlm_file *file,struct nlm_lock *lock, +struct nlm_cookie *cookie) {struct nlm_block *block; -struct nlm_host *host;struct nlm_rqst *call =NULL ; -/* Create host handle for callback */ - host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len); -if (host ==NULL ) -return NULL ; - call =nlm_alloc_call (host);if (call ==NULL )return NULL ;
@@ -366,6 +361,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) { struct nlm_block *block = NULL; +struct nlm_host *host;int error;__be32 ret;
@@ -377,6 +373,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, (long long )lock->fl.fl_end, wait); +/* Create host handle for callback */ + host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len); +if (host ==NULL ) +return nlm_lck_denied_nolocks;/* Lock file against concurrent access */ mutex_lock (&file->f_mutex);
@@ -385,7 +385,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,*/ block =nlmsvc_lookup_block (file, lock);if (block ==NULL ) { - block =nlmsvc_create_block (rqstp, file, lock, cookie); + block =nlmsvc_create_block (rqstp,nlm_get_host (host), file, + lock, cookie); ret = nlm_lck_denied_nolocks;if (block ==NULL ) goto out;
@@ -449,6 +450,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, out:mutex_unlock (&file->f_mutex);nlmsvc_release_block (block); +nlm_release_host (host);dprintk ("lockd: nlmsvc_lock returned %u\n" , ret);return ret; }
@@ -477,10 +479,17 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,if (block ==NULL ) {struct file_lock *conf =kzalloc (sizeof (*conf),GFP_KERNEL ); +struct nlm_host *host;if (conf ==NULL )return nlm_granted; - block =nlmsvc_create_block (rqstp, file, lock, cookie); +/* Create host handle for callback */ + host =nlmsvc_lookup_host (rqstp, lock->caller, lock->len); +if (host ==NULL ) { +kfree (conf); +return nlm_lck_denied_nolocks; + } + block =nlmsvc_create_block (rqstp, host, file, lock, cookie);if (block ==NULL ) {kfree (conf);return nlm_granted;
include/asm-i386/apic.h +2 -0
@@ -116,6 +116,8 @@ extern void enable_NMI_through_LVT0 (void * dummy);extern int timer_over_8254;extern int local_apic_timer_c2_ok; +extern int local_apic_timer_disabled; +#else /* !CONFIG_X86_LOCAL_APIC */ static inline void lapic_shutdown (void ) { }
include/asm-i386/cpufeature.h +1 -1
@@ -79,7 +79,7 @@#define X86_FEATURE_ARCH_PERFMON (3*32+11)/* Intel Architectural PerfMon */ #define X86_FEATURE_PEBS (3*32+12)/* Precise-Event Based Sampling */ #define X86_FEATURE_BTS (3*32+13)/* Branch Trace Store */ -#define X86_FEATURE_LAPIC_TIMER_BROKEN (3*32+ 14)/* lapic timer broken in C1 */ +/* 14 free */ #define X86_FEATURE_SYNC_RDTSC (3*32+15)/* RDTSC synchronizes the CPU */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
kernel/sys.c +2 -0
@@ -31,6 +31,7 @@#include <linux/cn_proc.h> #include <linux/getcpu.h> #include <linux/task_io_accounting_ops.h> +#include <linux/cpu.h> #include <linux/compat.h> #include <linux/syscalls.h>
@@ -865,6 +866,7 @@ EXPORT_SYMBOL_GPL(kernel_halt);void kernel_power_off (void ) {kernel_shutdown_prepare (SYSTEM_POWER_OFF ); +disable_nonboot_cpus ();printk (KERN_EMERG "Power down.\n" );machine_power_off (); }
kernel/time/timer_stats.c +3 -2
@@ -319,8 +319,9 @@ static int tstats_show(struct seq_file *m, void *v) ms =1 ;if (events && period.tv_sec) -seq_printf (m,"%ld total events, %ld.%ld events/sec\n" , events, - events / period.tv_sec, events *1000 / ms); +seq_printf (m,"%ld total events, %ld.%03ld events/sec\n" , + events, events *1000 / ms, + (events *1000000 / ms) %1000 );else seq_printf (m,"%ld total events\n" , events);
security/selinux/hooks.c +3 -0
@@ -1906,6 +1906,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)spin_unlock_irq (¤t->sighand->siglock); } +/* Always clear parent death signal on SID transitions. */ + current->pdeath_signal =0 ; +/* Check whether the new SID can inherit resource limits from the old SID. If not, reset all soft limits to the lower of the current task's hard limit and the init