Linux 2.6.20.17
Subsystems (34)
I've just released Linux 2.6.20.17.
As a reminder, it fixes these 3 security issues :
CVE-2007-3105
CVE-2007-3848
CVE-2007-3851
I'll also be replying to this message with a copy of the patch between 2.6.20.16 and 2.6.20.17.
The patch and changelog will appear soon at the following locations:
ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17
Git repository:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
http://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
Git repository through the gitweb interface:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git
Willy
-------
Makefile | 2 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 +-- arch/sparc/kernel/entry.S | 14 ++- arch/sparc/lib/memset.S | 2 arch/sparc64/kernel/head.S | 1 arch/um/os-Linux/user_syms.c | 20 +--- drivers/ata/ata_piix.c | 2 drivers/ata/pata_atiixp.c | 1 drivers/base/cpu.c | 2 drivers/char/drm/i915_dma.c | 14 ++- drivers/char/drm/i915_drv.h | 1 drivers/char/random.c | 9 +- drivers/char/sx.c | 4 drivers/cpufreq/cpufreq_ondemand.c | 30 ++++-- drivers/kvm/svm.c | 6 + drivers/kvm/svm.h | 3 drivers/md/dm-crypt.c | 5 - drivers/md/dm-exception-store.c | 11 +- drivers/md/dm-mpath.c | 3 drivers/md/dm-snap.c | 11 -- drivers/md/dm.c | 9 ++ drivers/md/raid10.c | 10 ++ drivers/media/video/v4l2-common.c | 19 +++- drivers/media/video/wm8739.c | 2 drivers/media/video/wm8775.c | 2 drivers/net/forcedeth.c | 108 ++++++++++++++++++++++--- drivers/pcmcia/cs.c | 3 drivers/scsi/aacraid/linit.c | 4 drivers/usb/core/hub.c | 10 +- drivers/video/macmodes.c | 5 - drivers/video/macmodes.h | 8 - drivers/video/stifb.c | 19 ++-- fs/9p/conv.c | 1 fs/direct-io.c | 1 fs/exec.c | 13 ++- fs/ext4/extents.c | 2 fs/jbd/commit.c | 3 fs/jbd2/commit.c | 3 fs/nfsd/vfs.c | 2 fs/splice.c | 5 - include/linux/Kbuild | 1 include/linux/netfilter_ipv4/ipt_iprange.h | 2 include/net/bluetooth/rfcomm.h | 1 include/net/xfrm.h | 1 ipc/shm.c | 2 kernel/lockdep_proc.c | 2 mm/hugetlb.c | 15 ++- mm/mlock.c | 5 - mm/readahead.c | 12 ++ net/bluetooth/rfcomm/tty.c | 34 ++++++- net/core/gen_estimator.c | 82 +++++++++++------- net/core/netpoll.c | 2 net/ieee80211/softmac/ieee80211softmac_assoc.c | 5 - net/ieee80211/softmac/ieee80211softmac_wx.c | 11 +- net/ipv6/addrconf.c | 1 net/ipv6/anycast.c | 1 net/ipv6/icmp.c | 2 net/ipv6/tcp_ipv6.c | 1 net/sctp/ipv6.c | 4 net/sunrpc/auth_gss/svcauth_gss.c | 9 +- net/xfrm/xfrm_policy.c | 2 61 files changed, 410 insertions(+), 168 deletions(-)
Summary of changes from 2.6.20.16 to 2.6.20.17
============================================
Adrian Bunk (2):
Missing header include in ipt_iprange.h drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit
Alan Cox (1):
aacraid: fix security hole
Alan Stern (1):
USB: fix warning caused by autosuspend counter going negative
Alexander Shmelev (1):
Fix sparc32 memset()
Alexey Dobriyan (1):
Fix leak on /proc/lockdep_stats
Arne Redlich (1):
md: handle writes to broken raid10 arrays gracefully
Ayaz Abdulla (2):
forcedeth bug fix: cicada phy
forcedeth bug fix: vitesse phy
Badari Pulavarty (1):
direct-io: fix error-path crashes
Daniel Ritz (1):
pcmcia: give socket time to power down
Dave Airlie (1):
drm/i915: Fix i965 secured batchbuffer usage (CVE-2007-3851)
David S. Miller (1):
Sparc64 bootup assembler bug
David Stevens (1):
IPV6: /proc/net/anycast6 unbalanced inet6_dev refcnt
Dmitry Butskoy (1):
Fix error queue socket lookup in ipv6
Fengguang Wu (1):
readahead: MIN_RA_PAGES/MAX_RA_PAGES macros
Hans Verkuil (2):
V4L: Add check for valid control ID to v4l2_ctrl_next
V4L: wm8775/wm8739: Fix memory leak when unloading module
Helge Deller (1):
stifb: detect cards in double buffer mode more reliably
Herbert van den Bergh (1):
do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY
Herton Ronaldo Krzesinski (1):
Include serial_reg.h with userspace headers
J. Bruce Fields (2):
nfsd: fix possible read-ahead cache and export table corruption
nfsd: fix possible oops on re-insertion of rpcsec_gss modules
Jan Kara (2):
jbd commit: fix transaction dropping
jbd2 commit: fix transaction dropping
Jean Tourrilhes (1):
softmac: Fix ESSID problem
Jeff Dike (1):
UML: exports for hostfs
Jeff Garzik (1):
pata_atiixp: add SB700 PCI ID
Jens Axboe (1):
splice: fix double page unlock
Jiri Slaby (1):
sx: switch subven and subid values
Joe Jin (1):
hugetlb: fix race in alloc_fresh_huge_page()
Joerg Roedel (1):
KVM: SVM: Reliably detect if SVM was disabled by BIOS
Maik Hampel (1):
md: raid10: fix use-after-free of bio
Marcel Holtmann (1):
Reset current->pdeath_signal on SUID binary execution (CVE-2007-3848)
Mariusz Kozlowski (1):
fs: 9p/conv.c error path fix
Mark Fortescue (1):
Fix sparc32 udelay() rounding errors.
Matt Mackall (1):
random: fix bound check ordering (CVE-2007-3105)
Michael Buesch (1):
softmac: Fix deadlock of wx_set_essid with assoc work
Mikko Rapeli (1):
Hangup TTY before releasing rfcomm_dev
Milan Broz (2):
dm io: fix panic on large request
dm snapshot: permit invalid activation
Mingming Cao (1):
"ext4_ext_put_in_cache" uses __u32 to receive physical block number
Patrick McHardy (2):
Fix IPCOMP crashes.
gen estimator timer unload race
Pavel Emelianov (1):
Fix user struct leakage with locked IPC shem segment
Ranko Zivojnovic (1):
gen estimator deadlock fix
Satyam Sharma (1):
Netpoll leak
Stefan Bader (1):
dm: disable barriers
Tejun Heo (1):
ata_piix: update map 10b for ich8m
Ulrich Drepper (1):
CPU online file permission
Venki Pallipadi (3):
acpi-cpufreq: Proper ReadModifyWrite of PERF_CTL MSR
CPUFREQ: ondemand: fix tickless accounting and software coordination bug
CPUFREQ: ondemand: add a check to avoid negative load calculation
Ville Tervo (1):
Keep rfcomm_dev on the list until it is freed
Vlad Yasevich (2):
SCTP scope_id handling fix
Fix ipv6 link down handling.
Willy Tarreau (1):
Linux 2.6.20.17
YOSHIFUJI Hideaki (1):
Fix TCP IPV6 MD5 bug.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 20 -EXTRAVERSION = .16 +EXTRAVERSION = .17 NAME = Homicidal Dwarf Hamster # *DOCUMENTATION*
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +5 -8
@@ -167,11 +167,13 @@ static void do_drv_read(struct drv_cmd *cmd)static void do_drv_write (struct drv_cmd *cmd) { -u32 h =0 ; +u32 lo, hi;switch (cmd->type) {case SYSTEM_INTEL_MSR_CAPABLE : -wrmsr (cmd->addr.msr.reg, cmd->val, h); +rdmsr (cmd->addr.msr.reg, lo, hi); + lo = (lo & ~INTEL_MSR_RANGE ) | (cmd->val &INTEL_MSR_RANGE ); +wrmsr (cmd->addr.msr.reg, lo, hi);break ;case SYSTEM_IO_CAPABLE : acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
@@ -372,7 +374,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,struct cpufreq_freqs freqs;cpumask_t online_policy_cpus;struct drv_cmd cmd; -unsigned int msr;unsigned int next_state =0 ;/* Index into freq_table */ unsigned int next_perf_state =0 ;/* Index into perf table */ unsigned int i;
@@ -417,11 +418,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,case SYSTEM_INTEL_MSR_CAPABLE : cmd.type =SYSTEM_INTEL_MSR_CAPABLE ; cmd.addr.msr.reg =MSR_IA32_PERF_CTL ; - msr = - (u32 ) perf->states[next_perf_state]. - control &INTEL_MSR_RANGE ; - cmd.val =get_cur_val (online_policy_cpus); - cmd.val = (cmd.val & ~INTEL_MSR_RANGE ) | msr; + cmd.val = (u32 ) perf->states[next_perf_state].control;break ;case SYSTEM_IO_CAPABLE : cmd.type =SYSTEM_IO_CAPABLE ;
arch/sparc/kernel/entry.S +10 -4
@@ -1749,8 +1749,8 @@ fpload: __ndelay: save %sp, -STACKFRAME_SZ, %sp mov %i0, %o0 - call .umul - mov 0x1ad, %o1 ! 2**32 / (1 000 000 000 / HZ) + call .umul ! round multiplier up so large ns ok + mov 0x1ae, %o1 ! 2**32 / (1 000 000 000 / HZ) call .umul mov %i1, %o1 ! udelay_val ba delay_continue
@@ -1760,11 +1760,17 @@ __ndelay: __udelay: save %sp, -STACKFRAME_SZ, %sp mov %i0, %o0 - sethi %hi(0x10c6), %o1 + sethi %hi(0x10c7), %o1 ! round multiplier up so large us ok call .umul - or %o1, %lo(0x10c6), %o1 ! 2**32 / 1 000 000 + or %o1, %lo(0x10c7), %o1 ! 2**32 / 1 000 000 call .umul mov %i1, %o1 ! udelay_val + sethi %hi(0x028f4b62), %l0 ! Add in rounding constant * 2**32, + or %g0, %lo(0x028f4b62), %l0 + addcc %o0, %l0, %o0 ! 2**32 * 0.009 999 + bcs,a 3f + add %o1, 0x01, %o1 +3: call .umul mov HZ, %o0 ! >>32 earlier for wider range
arch/sparc/lib/memset.S +1 -1
@@ -162,7 +162,7 @@ __bzero: 8: add %o0, 1, %o0 subcc %o1, 1, %o1 - bne,a 8b + bne 8b EX(stb %g3, [%o0 - 1], add %o1, 1) 0: retl
arch/sparc64/kernel/head.S +0 -1
@@ -458,7 +458,6 @@ tlb_fixup_done: or %g6, %lo(init_thread_union), %g6 ldx [%g6 + TI_TASK], %g4 mov %sp, %l6 - mov %o4, %l7 wr %g0, ASI_P, %asi mov 1, %g1
arch/um/os-Linux/user_syms.c +8 -12
@@ -5,7 +5,8 @@* so I *must* declare good prototypes for them and then EXPORT them. * The kernel code uses the macro defined by include/linux/string.h, * so I undef macros; the userspace code does not include that and I -* add an EXPORT for the glibc one.*/ +* add an EXPORT for the glibc one. +*/ #undef strlen#undef strstr
@@ -61,12 +62,18 @@ EXPORT_SYMBOL_PROTO(dup2);EXPORT_SYMBOL_PROTO (__xstat);EXPORT_SYMBOL_PROTO (__lxstat);EXPORT_SYMBOL_PROTO (__lxstat64); +EXPORT_SYMBOL_PROTO (__fxstat64);EXPORT_SYMBOL_PROTO (lseek);EXPORT_SYMBOL_PROTO (lseek64);EXPORT_SYMBOL_PROTO (chown); +EXPORT_SYMBOL_PROTO (fchown);EXPORT_SYMBOL_PROTO (truncate); +EXPORT_SYMBOL_PROTO (ftruncate64);EXPORT_SYMBOL_PROTO (utime); +EXPORT_SYMBOL_PROTO (utimes); +EXPORT_SYMBOL_PROTO (futimes);EXPORT_SYMBOL_PROTO (chmod); +EXPORT_SYMBOL_PROTO (fchmod);EXPORT_SYMBOL_PROTO (rename);EXPORT_SYMBOL_PROTO (__xmknod);
@@ -102,14 +109,3 @@ EXPORT_SYMBOL(__stack_smash_handler); extern long __guard __attribute__((weak));EXPORT_SYMBOL (__guard ); - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-file-style: "linux" -* End: -*/
drivers/ata/ata_piix.c +1 -1
@@ -431,7 +431,7 @@ static const struct piix_map_db ich8_map_db = {/* PM PS SM SS MAP */ { P0, P2, P1, P3 }, /* 00b (hardwired when in AHCI) */ { RV, RV, RV, RV }, - { IDE, IDE, NA, NA }, /* 10b (IDE mode) */ + { P0, P2, IDE, IDE }, /* 10b (IDE mode) */ { RV, RV, RV, RV }, }, };
drivers/ata/pata_atiixp.c +1 -0
@@ -283,6 +283,7 @@ static const struct pci_device_id atiixp[] = { { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP300_IDE), }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), }, + { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), }, { }, };
drivers/base/cpu.c +1 -1
@@ -53,7 +53,7 @@ static ssize_t store_online(struct sys_device *dev, const char *buf, ret = count;return ret; } -static SYSDEV_ATTR(online, 0600, show_online, store_online); +static SYSDEV_ATTR(online, 0644, show_online, store_online);static void __devinit register_cpu_control (struct cpu *cpu) {
drivers/char/drm/i915_dma.c +11 -3
@@ -172,6 +172,8 @@ static int i915_initialize(drm_device_t * dev,* private backbuffer/depthbuffer usage. */ dev_priv->use_mi_batchbuffer_start =0 ; +if (IS_I965G (dev))/* 965 doesn't support older method */ + dev_priv->use_mi_batchbuffer_start =1 ;/* Allow hardware batchbuffers unless told otherwise. */
@@ -504,8 +506,13 @@ static int i915_dispatch_batchbuffer(drm_device_t * dev,if (dev_priv->use_mi_batchbuffer_start) {BEGIN_LP_RING (2 ); -OUT_RING (MI_BATCH_BUFFER_START | (2 <<6 )); -OUT_RING (batch->start |MI_BATCH_NON_SECURE ); +if (IS_I965G (dev)) { +OUT_RING (MI_BATCH_BUFFER_START | (2 <<6 ) |MI_BATCH_NON_SECURE_I965 ); +OUT_RING (batch->start); + }else { +OUT_RING (MI_BATCH_BUFFER_START | (2 <<6 )); +OUT_RING (batch->start |MI_BATCH_NON_SECURE ); + }ADVANCE_LP_RING (); }else {BEGIN_LP_RING (4 );
@@ -722,7 +729,8 @@ static int i915_setparam(DRM_IOCTL_ARGS)switch (param.param) {case I915_SETPARAM_USE_MI_BATCHBUFFER_START : - dev_priv->use_mi_batchbuffer_start = param.value; +if (!IS_I965G (dev)) + dev_priv->use_mi_batchbuffer_start = param.value;break ;case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY : dev_priv->tex_lru_log_granularity = param.value;
drivers/char/drm/i915_drv.h +1 -0
@@ -280,6 +280,7 @@ extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller);#define MI_BATCH_BUFFER_START (0x31<<23)#define MI_BATCH_BUFFER_END (0xA<<23)#define MI_BATCH_NON_SECURE (1) +#define MI_BATCH_NON_SECURE_I965 (1<<8)#define MI_WAIT_FOR_EVENT ((0x3<<23))#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
drivers/char/random.c +7 -2
@@ -693,9 +693,14 @@ static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes)if (r->pull && r->entropy_count < nbytes *8 && r->entropy_count < r->poolinfo->POOLBITS) { -int bytes =max_t (int, random_read_wakeup_thresh /8 , -min_t (int, nbytes,sizeof (tmp))); +/* If we're limited, always leave two wakeup worth's BITS */ int rsvd = r->limit ?0 : random_read_wakeup_thresh/4 ; +int bytes = nbytes; + +/* pull at least as many as BYTES as wakeup BITS */ + bytes =max_t (int, bytes, random_read_wakeup_thresh /8 ); +/* but never more than the buffer size */ + bytes =min_t (int, bytes,sizeof (tmp)); DEBUG_ENT("going to reseed %s with %d bits " "(%d of %d requested)\n",
drivers/char/sx.c +2 -2
@@ -2721,9 +2721,9 @@ static void __devexit sx_pci_remove(struct pci_dev *pdev)its because the standard requires it. So check for SUBVENDOR_ID. */ static struct pci_device_id sx_pci_tbl[] = { {PCI_VENDOR_ID_SPECIALIX ,PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8 , - .subvendor =0x0200 ,.subdevice =PCI_ANY_ID }, + .subvendor =PCI_ANY_ID , .subdevice =0x0200 }, {PCI_VENDOR_ID_SPECIALIX ,PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8 , - .subvendor =0x0300 ,.subdevice =PCI_ANY_ID }, + .subvendor =PCI_ANY_ID , .subdevice =0x0300 }, {0 } };
drivers/cpufreq/cpufreq_ondemand.c +21 -9
@@ -95,15 +95,25 @@ static struct dbs_tuners {static inline cputime64_t get_cpu_idle_time (unsigned int cpu) { -cputime64_t retval; +cputime64_t idle_time; +cputime64_t cur_jiffies; +cputime64_t busy_time; - retval =cputime64_add (kstat_cpu (cpu).cpustat.idle, -kstat_cpu (cpu).cpustat.iowait); + cur_jiffies =jiffies64_to_cputime64 (get_jiffies_64 ()); + busy_time =cputime64_add (kstat_cpu (cpu).cpustat.user, +kstat_cpu (cpu).cpustat.system); -if (dbs_tuners_ins.ignore_nice) - retval =cputime64_add (retval,kstat_cpu (cpu).cpustat.nice); + busy_time =cputime64_add (busy_time,kstat_cpu (cpu).cpustat.irq); + busy_time =cputime64_add (busy_time,kstat_cpu (cpu).cpustat.softirq); + busy_time =cputime64_add (busy_time,kstat_cpu (cpu).cpustat.steal); -return retval; +if (!dbs_tuners_ins.ignore_nice) { + busy_time =cputime64_add (busy_time, +kstat_cpu (cpu).cpustat.nice); + } + + idle_time =cputime64_sub (cur_jiffies, busy_time); +return idle_time; }/*
@@ -324,7 +334,7 @@ static struct attribute_group dbs_attr_group = {static void dbs_check_cpu (struct cpu_dbs_info_s *this_dbs_info) {unsigned int idle_ticks, total_ticks; -unsigned int load; +unsigned int load =0 ;cputime64_t cur_jiffies;struct cpufreq_policy *policy;
@@ -338,7 +348,8 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) cur_jiffies =jiffies64_to_cputime64 (get_jiffies_64 ()); total_ticks = (unsigned int )cputime64_sub (cur_jiffies, this_dbs_info->prev_cpu_wall); - this_dbs_info->prev_cpu_wall = cur_jiffies; + this_dbs_info->prev_cpu_wall =get_jiffies_64 (); +if (!total_ticks)return ;/*
@@ -369,7 +380,8 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)if (tmp_idle_ticks < idle_ticks) idle_ticks = tmp_idle_ticks; } - load = (100 * (total_ticks - idle_ticks)) / total_ticks; +if (likely (total_ticks > idle_ticks)) + load = (100 * (total_ticks - idle_ticks)) / total_ticks;/* Check for frequency increase */ if (load > dbs_tuners_ins.up_threshold) {
drivers/kvm/svm.c +6 -0
@@ -1655,6 +1655,12 @@ static void svm_inject_page_fault(struct kvm_vcpu *vcpu,static int is_disabled (void ) { +u64 vm_cr; + +rdmsrl (MSR_VM_CR , vm_cr); +if (vm_cr & (1 <<SVM_VM_CR_SVM_DISABLE )) +return 1 ; +return 0 ; }
drivers/kvm/svm.h +3 -0
@@ -172,8 +172,11 @@ struct __attribute__ ((__packed__)) vmcb {#define SVM_CPUID_FUNC 0x8000000a#define MSR_EFER_SVME_MASK (1ULL << 12) +#define MSR_VM_CR 0xc0010114#define MSR_VM_HSAVE_PA 0xc0010117ULL +#define SVM_VM_CR_SVM_DISABLE 4 +#define SVM_SELECTOR_S_SHIFT 4#define SVM_SELECTOR_DPL_SHIFT 5#define SVM_SELECTOR_P_SHIFT 7
drivers/md/dm-crypt.c +2 -3
@@ -917,6 +917,8 @@ static void crypt_dtr(struct dm_target *ti) {struct crypt_config *cc = (struct crypt_config *) ti->private; +flush_workqueue (_kcryptd_workqueue); +bioset_free (cc->bs);mempool_destroy (cc->page_pool);mempool_destroy (cc->io_pool);
@@ -938,9 +940,6 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,struct crypt_config *cc = ti->private;struct crypt_io *io; -if (bio_barrier (bio)) -return -EOPNOTSUPP ; - io =mempool_alloc (cc->io_pool,GFP_NOIO ); io->target = ti; io->base_bio = bio;
drivers/md/dm-exception-store.c +6 -5
@@ -453,11 +453,6 @@ static int persistent_read_metadata(struct exception_store *store)/* * Sanity checks. */ -if (!ps->valid) { -DMWARN ("snapshot is marked invalid" ); -return -EINVAL ; - } -if (ps->version !=SNAPSHOT_DISK_VERSION ) {DMWARN ("unable to handle snapshot disk version %d" , ps->version);
@@ -465,6 +460,12 @@ static int persistent_read_metadata(struct exception_store *store) }/* +* Metadata are valid, but snapshot is invalidated +*/ +if (!ps->valid) +return 1 ; + +/* * Read the metadata. */ r =read_exceptions (ps);
drivers/md/dm-mpath.c +0 -3
@@ -795,9 +795,6 @@ static int multipath_map(struct dm_target *ti, struct bio *bio,struct mpath_io *mpio;struct multipath *m = (struct multipath *) ti->private; -if (bio_barrier (bio)) -return -EOPNOTSUPP ; - mpio =mempool_alloc (m->mpio_pool,GFP_NOIO );dm_bio_record (&mpio->details, bio);
drivers/md/dm-snap.c +4 -7
@@ -522,9 +522,12 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)/* Metadata must only be loaded into one table at once */ r = s->store.read_metadata (&s->store); -if (r) { +if (r <0 ) { ti->error ="Failed to read snapshot metadata" ; goto bad6; + }else if (r >0 ) { + s->valid =0 ; +DMWARN ("Snapshot is marked invalid." ); }bio_list_init (&s->queued_bios);
@@ -884,9 +887,6 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,if (!s->valid)return -EIO ; -if (unlikely (bio_barrier (bio))) -return -EOPNOTSUPP ; -/* FIXME: should only take write lock if we need * to copy an exception */ down_write (&s->lock);
@@ -1157,9 +1157,6 @@ static int origin_map(struct dm_target *ti, struct bio *bio,struct dm_dev *dev = (struct dm_dev *) ti->private; bio->bi_bdev = dev->bdev; -if (unlikely (bio_barrier (bio))) -return -EOPNOTSUPP ; -/* Only tell snapshots if this is a write */ return (bio_rw (bio) ==WRITE ) ?do_origin (dev, bio) :DM_MAPIO_REMAPPED ; }
drivers/md/dm.c +9 -0
@@ -802,6 +802,15 @@ static int dm_request(request_queue_t *q, struct bio *bio)int rw =bio_data_dir (bio);struct mapped_device *md = q->queuedata; +/* +* There is no use in forwarding any barrier request since we can't +* guarantee it is (or can be) handled by the targets correctly. +*/ +if (unlikely (bio_barrier (bio))) { +bio_endio (bio, bio->bi_size, -EOPNOTSUPP ); +return 0 ; + } +down_read (&md->io_lock);disk_stat_inc (dm_disk (md), ios[rw]);
drivers/md/raid10.c +9 -1
@@ -917,6 +917,13 @@ static int make_request(request_queue_t *q, struct bio * bio)bio_list_add (&bl, mbio); } +if (unlikely (!atomic_read (&r10_bio->remaining))) { +/* the array is dead */ +md_write_end (mddev); +raid_end_bio_io (r10_bio); +return 0 ; + } +bitmap_startwrite (mddev->bitmap, bio->bi_sector, r10_bio->sectors,0 );spin_lock_irqsave (&conf->device_lock, flags);bio_list_merge (&conf->pending_bio_list, &bl);
@@ -1558,7 +1565,6 @@ static void raid10d(mddev_t *mddev) bio = r10_bio->devs[r10_bio->read_slot].bio; r10_bio->devs[r10_bio->read_slot].bio = mddev->ro ?IO_BLOCKED :NULL ; -bio_put (bio); mirror =read_balance (conf, r10_bio);if (mirror ==-1 ) { printk(KERN_ALERT "raid10: %s: unrecoverable I/O"
@@ -1566,8 +1572,10 @@ static void raid10d(mddev_t *mddev)bdevname (bio->bi_bdev,b), (unsigned long long)r10_bio->sector);raid_end_bio_io (r10_bio); +bio_put (bio); }else {const int do_sync =bio_sync (r10_bio->master_bio); +bio_put (bio); rdev = conf->mirrors[mirror].rdev;if (printk_ratelimit ()) printk(KERN_ERR "raid10: %s: redirecting sector %llu to"
drivers/media/video/v4l2-common.c +14 -5
@@ -1499,16 +1499,25 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qcWhen no more controls are available 0 is returned. */ u32 v4l2_ctrl_next (const u32 *const * ctrl_classes,u32 id) { -u32 ctrl_class; +u32 ctrl_class =V4L2_CTRL_ID2CLASS (id);const u32 *pctrl; -/* if no query is desired, then just return the control ID */ -if ((id &V4L2_CTRL_FLAG_NEXT_CTRL ) ==0 ) -return id;if (ctrl_classes ==NULL )return 0 ; + +/* if no query is desired, then check if the ID is part of ctrl_classes */ +if ((id &V4L2_CTRL_FLAG_NEXT_CTRL ) ==0 ) { +/* find class */ +while (*ctrl_classes &&V4L2_CTRL_ID2CLASS (**ctrl_classes) != ctrl_class) + ctrl_classes++; +if (*ctrl_classes ==NULL ) +return 0 ; + pctrl = *ctrl_classes; +/* find control ID */ +while (*pctrl && *pctrl != id) pctrl++; +return *pctrl ? id :0 ; + } id &=V4L2_CTRL_ID_MASK ; - ctrl_class =V4L2_CTRL_ID2CLASS (id); id++;/* select next control */ /* find first class that matches (or is greater than) the class of the ID */
drivers/media/video/wm8739.c +2 -0
@@ -317,12 +317,14 @@ static int wm8739_probe(struct i2c_adapter *adapter)static int wm8739_detach (struct i2c_client *client) { +struct wm8739_state *state =i2c_get_clientdata (client);int err; err =i2c_detach_client (client);if (err)return err; +kfree (state);kfree (client);return 0 ; }
drivers/media/video/wm8775.c +2 -0
@@ -218,12 +218,14 @@ static int wm8775_probe(struct i2c_adapter *adapter)static int wm8775_detach (struct i2c_client *client) { +struct wm8775_state *state =i2c_get_clientdata (client);int err; err =i2c_detach_client (client);if (err) {return err; } +kfree (state);kfree (client);return 0 ;
drivers/net/forcedeth.c +98 -10
142 lines not on this page · raw message
drivers/pcmcia/cs.c +3 -0
@@ -410,6 +410,9 @@ static void socket_shutdown(struct pcmcia_socket *s)#endif s->functions =0 ; +/* give socket some time to power down */ +msleep (100 ); + s->ops->get_status (s, &status);if (status &SS_POWERON ) {printk (KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n" , s);
drivers/scsi/aacraid/linit.c +4 -0
@@ -539,6 +539,8 @@ static int aac_cfg_open(struct inode *inode, struct file *file)static int aac_cfg_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg) { +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ;return aac_do_ioctl (file->private_data, cmd, (void __user *)arg); }
@@ -592,6 +594,8 @@ static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)static long aac_compat_cfg_ioctl (struct file *file,unsigned cmd,unsigned long arg) { +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ;return aac_compat_do_ioctl ((struct aac_dev *)file->private_data, cmd, arg); }#endif
drivers/usb/core/hub.c +6 -4
@@ -1356,6 +1356,10 @@ static int __usb_new_device(void *void_data) }#endif +/* Increment the parent's count of unsuspended children */ +if (udev->parent) +usb_autoresume_device (udev->parent); +/* Register the device. The device driver is responsible * for adding the device files to usbfs and sysfs and for * configuring the device.
@@ -1363,13 +1367,11 @@ static int __usb_new_device(void *void_data) err =device_add (&udev->dev);if (err) {dev_err (&udev->dev,"can't device_add, error %d\n" , err); +if (udev->parent) +usb_autosuspend_device (udev->parent); goto fail; } -/* Increment the parent's count of unsuspended children */ -if (udev->parent) -usb_autoresume_device (udev->parent); - exit:module_put (THIS_MODULE );return err;
drivers/video/macmodes.c +2 -3
@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense);* */ -int __devinit mac_find_mode (struct fb_var_screeninfo *var, -struct fb_info *info,const char *mode_option, -unsigned int default_bpp) +int mac_find_mode (struct fb_var_screeninfo *var,struct fb_info *info, +const char *mode_option,unsigned int default_bpp) {const struct fb_videomode *db =NULL ;unsigned int dbsize =0 ;
drivers/video/macmodes.h +4 -4
@@ -55,10 +55,10 @@ extern int mac_vmode_to_var(int vmode, int cmode,extern int mac_var_to_vmode (const struct fb_var_screeninfo *var,int *vmode,int *cmode);extern int mac_map_monitor_sense (int sense); -extern int __devinit mac_find_mode (struct fb_var_screeninfo *var, -struct fb_info *info, -const char *mode_option, -unsigned int default_bpp); +extern int mac_find_mode (struct fb_var_screeninfo *var, +struct fb_info *info, +const char *mode_option, +unsigned int default_bpp);/*
drivers/video/stifb.c +12 -7
@@ -1101,13 +1101,18 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref)/* only supported cards are allowed */ switch (fb->id) {case CRT_ID_VISUALIZE_EG : -/* look for a double buffering device like e.g. the -"INTERNAL_EG_DX1024" in the RDI precisionbook laptop -which won't work. The same device in non-double -buffering mode returns "INTERNAL_EG_X1024". */ -if (strstr (sti->outptr.dev_name,"EG_DX" )) { -printk (KERN_WARNING -"stifb: ignoring '%s'. Disable double buffering in IPL menu.\n" , +/* Visualize cards can run either in "double buffer" or +"standard" mode. Depending on the mode, the card reports +a different device name, e.g. "INTERNAL_EG_DX1024" in double +buffer mode and "INTERNAL_EG_X1024" in standard mode. +Since this driver only supports standard mode, we check +if the device name contains the string "DX" and tell the +user how to reconfigure the card. */ +if (strstr (sti->outptr.dev_name,"DX" )) { +printk (KERN_WARNING "WARNING: stifb framebuffer driver does not " +"support '%s' in double-buffer mode.\n" +KERN_WARNING "WARNING: Please disable the double-buffer mode " +"in IPL menu (the PARISC-BIOS).\n" , sti->outptr.dev_name); goto out_err0; }
fs/9p/conv.c +1 -0
@@ -742,6 +742,7 @@ struct v9fs_fcall *v9fs_create_twrite(u32 fid, u64 offset, u32 count,if (err) {kfree (fc); fc =ERR_PTR (err); + goto error; }if (buf_check_overflow (bufp)) {
fs/direct-io.c +1 -0
@@ -978,6 +978,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode, dio->get_block = get_block; dio->end_io = end_io; dio->map_bh.b_private =NULL ; + dio->map_bh.b_state =0 ; dio->final_block_in_bio =-1 ; dio->next_block_for_io =-1 ;
fs/exec.c +9 -4
@@ -881,9 +881,12 @@ int flush_old_exec(struct linux_binprm * bprm)*/ current->mm->task_size =TASK_SIZE ; -if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || -file_permission (bprm->file,MAY_READ ) || - (bprm->interp_flags &BINPRM_FLAGS_ENFORCE_NONDUMP )) { +if (bprm->e_uid != current->euid || bprm->e_gid != current->egid) { +suid_keys (current); + current->mm->dumpable = suid_dumpable; + current->pdeath_signal =0 ; + }else if (file_permission (bprm->file,MAY_READ ) || + (bprm->interp_flags &BINPRM_FLAGS_ENFORCE_NONDUMP )) {suid_keys (current); current->mm->dumpable = suid_dumpable; }
@@ -974,8 +977,10 @@ void compute_creds(struct linux_binprm *bprm) {int unsafe; -if (bprm->e_uid != current->uid) +if (bprm->e_uid != current->uid) {suid_keys (current); + current->pdeath_signal =0 ; + }exec_keys (current);task_lock (current);
fs/ext4/extents.c +1 -1
@@ -1397,7 +1397,7 @@ int ext4_ext_walk_space(struct inode *inode, unsigned long block,static void ext4_ext_put_in_cache (struct inode *inode,__u32 block, -__u32 len,__u32 start,int type) +__u32 len,ext4_fsblk_t start,int type) {struct ext4_ext_cache *cex;BUG_ON (len ==0 );
fs/jbd/commit.c +2 -1
@@ -888,7 +888,8 @@ restart_loop: journal->j_committing_transaction =NULL ;spin_unlock (&journal->j_state_lock); -if (commit_transaction->t_checkpoint_list ==NULL ) { +if (commit_transaction->t_checkpoint_list ==NULL && + commit_transaction->t_checkpoint_io_list ==NULL ) {__journal_drop_transaction (journal, commit_transaction); }else {if (journal->j_checkpoint_transactions ==NULL ) {
fs/jbd2/commit.c +2 -1
@@ -897,7 +897,8 @@ restart_loop: journal->j_committing_transaction =NULL ;spin_unlock (&journal->j_state_lock); -if (commit_transaction->t_checkpoint_list ==NULL ) { +if (commit_transaction->t_checkpoint_list ==NULL && + commit_transaction->t_checkpoint_io_list ==NULL ) {__jbd2_journal_drop_transaction (journal, commit_transaction); }else {if (journal->j_checkpoint_transactions ==NULL ) {
fs/nfsd/vfs.c +1 -1
@@ -1887,7 +1887,7 @@ nfsd_racache_init(int cache_size) raparm_hash[i].pb_head =NULL ;spin_lock_init (&raparm_hash[i].pb_lock); } - nperbucket = cache_size >>RAPARM_HASH_BITS ; + nperbucket =DIV_ROUND_UP (cache_size,RAPARM_HASH_SIZE );for (i =0 ; i < cache_size -1 ; i++) {if (i % nperbucket ==0 ) raparm_hash[j++].pb_head = raparml + i;
fs/splice.c +3 -2
@@ -614,7 +614,7 @@ find_page: ret =add_to_page_cache_lru (page, mapping, index,GFP_KERNEL );if (unlikely (ret)) - goto out; + goto out_release; }/*
@@ -695,8 +695,9 @@ find_page: goto find_page; } out: -page_cache_release (page);unlock_page (page); +out_release: +page_cache_release (page); out_ret:return ret; }
include/linux/Kbuild +1 -0
@@ -134,6 +134,7 @@ header-y += radeonfb.h header-y += raw.h header-y += resource.h header-y += rose.h +header-y += serial_reg.h header-y += smbno.h header-y += snmp.h header-y += sockios.h
include/linux/netfilter_ipv4/ipt_iprange.h +2 -0
@@ -1,6 +1,8 @@#ifndef _IPT_IPRANGE_H#define _IPT_IPRANGE_H +#include <linux/types.h> +#define IPRANGE_SRC 0x01/* Match source IP address */ #define IPRANGE_DST 0x02/* Match destination IP address */ #define IPRANGE_SRC_INV 0x10/* Negate the condition */
include/net/bluetooth/rfcomm.h +1 -0
@@ -323,6 +323,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc#define RFCOMM_RELEASE_ONHUP 1#define RFCOMM_HANGUP_NOW 2#define RFCOMM_TTY_ATTACHED 3 +#define RFCOMM_TTY_RELEASED 4struct rfcomm_dev_req {s16 dev_id;
include/net/xfrm.h +0 -1
@@ -561,7 +561,6 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctstruct xfrm_dst {union { -struct xfrm_dst *next;struct dst_entry dst;struct rtable rt;struct rt6_info rt6;
ipc/shm.c +1 -1
@@ -652,7 +652,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf)struct user_struct * user = current->user;if (!is_file_hugepages (shp->shm_file)) { err =shmem_lock (shp->shm_file,1 , user); -if (!err) { +if (!err && !(shp->shm_perm.mode &SHM_LOCKED )){ shp->shm_perm.mode |=SHM_LOCKED ; shp->mlock_user = user; }
kernel/lockdep_proc.c +1 -1
@@ -323,7 +323,7 @@ static const struct file_operations proc_lockdep_stats_operations = { .open = lockdep_stats_open, .read = seq_read, .llseek = seq_lseek, - .release = seq_release, + .release = single_release, };static int __init lockdep_proc_init (void )
mm/hugetlb.c +11 -4
@@ -101,13 +101,20 @@ static void free_huge_page(struct page *page)static int alloc_fresh_huge_page (void ) { -static int nid =0 ; +static int prev_nid;struct page *page; - page =alloc_pages_node (nid,GFP_HIGHUSER |__GFP_COMP|__GFP_NOWARN, -HUGETLB_PAGE_ORDER ); - nid =next_node (nid, node_online_map); +static DEFINE_SPINLOCK (nid_lock); +int nid; + +spin_lock (&nid_lock); + nid =next_node (prev_nid, node_online_map);if (nid ==MAX_NUMNODES ) nid =first_node (node_online_map); + prev_nid = nid; +spin_unlock (&nid_lock); + + page =alloc_pages_node (nid,GFP_HIGHUSER |__GFP_COMP|__GFP_NOWARN, +HUGETLB_PAGE_ORDER );if (page) {set_compound_page_dtor (page, free_huge_page);spin_lock (&hugetlb_lock);
mm/mlock.c +4 -1
@@ -233,9 +233,12 @@ int user_shm_lock(size_t size, struct user_struct *user) locked = (size +PAGE_SIZE -1 ) >>PAGE_SHIFT ; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK ].rlim_cur; +if (lock_limit ==RLIM_INFINITY ) + allowed =1 ; lock_limit >>=PAGE_SHIFT ;spin_lock (&shmlock_user_lock); -if (locked + user->locked_shm > lock_limit && !capable (CAP_IPC_LOCK )) +if (!allowed && + locked + user->locked_shm > lock_limit && !capable (CAP_IPC_LOCK )) goto out;get_uid (user); user->locked_shm += locked;
mm/readahead.c +10 -2
@@ -21,8 +21,16 @@ void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) }EXPORT_SYMBOL (default_unplug_io_fn); +/* +* Convienent macros for min/max read-ahead pages. +* Note that MAX_RA_PAGES is rounded down, while MIN_RA_PAGES is rounded up. +* The latter is necessary for systems with large page size(i.e. 64k). +*/ +#define MAX_RA_PAGES (VM_MAX_READAHEAD*1024 / PAGE_CACHE_SIZE) +#define MIN_RA_PAGES DIV_ROUND_UP(VM_MIN_READAHEAD*1024, PAGE_CACHE_SIZE) +struct backing_dev_info default_backing_dev_info = { - .ra_pages = (VM_MAX_READAHEAD *1024 ) /PAGE_CACHE_SIZE , + .ra_pages =MAX_RA_PAGES , .state =0 , .capabilities =BDI_CAP_MAP_COPY , .unplug_io_fn = default_unplug_io_fn,
@@ -51,7 +59,7 @@ static inline unsigned long get_max_readahead(struct file_ra_state *ra)static inline unsigned long get_min_readahead (struct file_ra_state *ra) { -return (VM_MIN_READAHEAD *1024 ) /PAGE_CACHE_SIZE ; +return MIN_RA_PAGES ; }static inline void reset_ahead_window (struct file_ra_state *ra)
net/bluetooth/rfcomm/tty.c +26 -8
@@ -93,6 +93,10 @@ static void rfcomm_dev_destruct(struct rfcomm_dev *dev)BT_DBG ("dev %p dlc %p" , dev, dlc); +write_lock_bh (&rfcomm_dev_lock); +list_del_init (&dev->list); +write_unlock_bh (&rfcomm_dev_lock); +rfcomm_dlc_lock (dlc);/* Detach DLC if it's owned by this dev */ if (dlc->owner == dev)
@@ -154,8 +158,13 @@ static inline struct rfcomm_dev *rfcomm_dev_get(int id)read_lock (&rfcomm_dev_lock); dev =__rfcomm_dev_get (id); -if (dev) -rfcomm_dev_hold (dev); + +if (dev) { +if (test_bit (RFCOMM_TTY_RELEASED , &dev->flags)) + dev =NULL ; +else +rfcomm_dev_hold (dev); + }read_unlock (&rfcomm_dev_lock);
@@ -263,6 +272,12 @@ out:tty_register_device (rfcomm_tty_driver, dev->id,rfcomm_get_device (dev)); +if (IS_ERR (dev->tty_dev)) { +list_del (&dev->list); +kfree (dev); +return PTR_ERR (dev->tty_dev); + } +return dev->id; }
@@ -270,10 +285,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev) {BT_DBG ("dev %p" , dev); -write_lock_bh (&rfcomm_dev_lock); -list_del_init (&dev->list); -write_unlock_bh (&rfcomm_dev_lock); - +set_bit (RFCOMM_TTY_RELEASED , &dev->flags);rfcomm_dev_put (dev); }
@@ -327,7 +339,7 @@ static int rfcomm_create_dev(struct sock *sk, void __user *arg)if (copy_from_user (&req, arg,sizeof (req)))return -EFAULT ; -BT_DBG ("sk %p dev_id %id flags 0x%x" , sk, req.dev_id, req.flags); +BT_DBG ("sk %p dev_id %d flags 0x%x" , sk, req.dev_id, req.flags);if (req.flags !=NOCAP_FLAGS && !capable (CAP_NET_ADMIN ))return -EPERM ;
@@ -368,7 +380,7 @@ static int rfcomm_release_dev(void __user *arg)if (copy_from_user (&req, arg,sizeof (req)))return -EFAULT ; -BT_DBG ("dev_id %id flags 0x%x" , req.dev_id, req.flags); +BT_DBG ("dev_id %d flags 0x%x" , req.dev_id, req.flags);if (!(dev =rfcomm_dev_get (req.dev_id)))return -ENODEV ;
@@ -381,6 +393,10 @@ static int rfcomm_release_dev(void __user *arg)if (req.flags & (1 <<RFCOMM_HANGUP_NOW ))rfcomm_dlc_close (dev->dlc,0 ); +/* Shut down TTY synchronously before freeing rfcomm_dev */ +if (dev->tty) +tty_vhangup (dev->tty); +rfcomm_dev_del (dev);rfcomm_dev_put (dev);return 0 ;
@@ -413,6 +429,8 @@ static int rfcomm_get_dev_list(void __user *arg)list_for_each (p, &rfcomm_dev_list) { struct rfcomm_dev *dev = list_entry(p, struct rfcomm_dev, list); +if (test_bit (RFCOMM_TTY_RELEASED , &dev->flags)) +continue ; (di + n)->id = dev->id; (di + n)->flags = dev->flags; (di + n)->state = dev->dlc->state;
net/core/gen_estimator.c +50 -32
171 lines not on this page · raw message
net/core/netpoll.c +1 -1
@@ -776,7 +776,6 @@ void netpoll_cleanup(struct netpoll *np)spin_unlock_irqrestore (&npinfo->rx_lock, flags); } - np->dev->npinfo =NULL ;if (atomic_dec_and_test (&npinfo->refcnt)) {skb_queue_purge (&npinfo->arp_tx);skb_queue_purge (&npinfo->txq);
@@ -784,6 +783,7 @@ void netpoll_cleanup(struct netpoll *np)flush_scheduled_work ();kfree (npinfo); + np->dev->npinfo =NULL ; } }
net/ieee80211/softmac/ieee80211softmac_assoc.c +4 -1
@@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_struct *work)*/ dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");ieee80211softmac_notify (mac->dev,IEEE80211SOFTMAC_EVENT_SCAN_FINISHED , ieee80211softmac_assoc_notify_scan,NULL ); -if (ieee80211softmac_start_scan (mac)) +if (ieee80211softmac_start_scan (mac)) { dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); + mac->associnfo.associating =0 ; + mac->associnfo.associated =0 ; + } goto out; }else { mac->associnfo.associating =0 ;
net/ieee80211/softmac/ieee80211softmac_wx.c +8 -3
@@ -74,8 +74,8 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,struct ieee80211softmac_auth_queue_item *authptr;int length =0 ; +check_assoc_again:mutex_lock (&sm->associnfo.mutex); -/* Check if we're already associating to this or another network * If it's another network, cancel and start over with our new network * If it's our network, ignore the change, we're already doing it!
@@ -98,13 +98,18 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,cancel_delayed_work (&authptr->work); sm->associnfo.bssvalid =0 ; sm->associnfo.bssfixed =0 ; -flush_scheduled_work (); sm->associnfo.associating =0 ; sm->associnfo.associated =0 ; +/* We must unlock to avoid deadlocks with the assoc workqueue +* on the associnfo.mutex */ +mutex_unlock (&sm->associnfo.mutex); +flush_scheduled_work (); +/* Avoid race! Check assoc status again. Maybe someone started an +* association while we flushed. */ + goto check_assoc_again; } } - sm->associnfo.static_essid =0 ; sm->associnfo.assoc_wait =0 ;
net/ipv6/addrconf.c +1 -0
@@ -2451,6 +2451,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)write_unlock_bh (&idev->lock);__ipv6_ifa_notify (RTM_DELADDR , ifa); +atomic_notifier_call_chain (&inet6addr_chain,NETDEV_DOWN , ifa);in6_ifa_put (ifa);write_lock_bh (&idev->lock);
net/ipv6/anycast.c +1 -0
@@ -67,6 +67,7 @@ ip6_onlink(struct in6_addr *addr, struct net_device *dev)break ; }read_unlock_bh (&idev->lock); +in6_dev_put (idev); }rcu_read_unlock ();return onlink;
net/ipv6/icmp.c +1 -1
@@ -600,7 +600,7 @@ static void icmpv6_notify(struct sk_buff *skb, int type, int code, __be32 info)read_lock (&raw_v6_lock);if ((sk =sk_head (&raw_v6_htable[hash])) !=NULL ) { -while ((sk =__raw_v6_lookup (sk, nexthdr, daddr, saddr, +while ((sk =__raw_v6_lookup (sk, nexthdr, saddr, daddr,IP6CB (skb)->iif))) {rawv6_err (sk, skb,NULL , type, code, inner_offset, info); sk =sk_next (sk);
net/ipv6/tcp_ipv6.c +1 -0
@@ -637,6 +637,7 @@ static int tcp_v6_md5_do_del(struct sock *sk, struct in6_addr *peer)if (tp->md5sig_info->entries6 ==0 ) {kfree (tp->md5sig_info->keys6); tp->md5sig_info->keys6 =NULL ; + tp->md5sig_info->alloced6 =0 ;tcp_free_md5sig_pool ();
net/sctp/ipv6.c +4 -0
@@ -874,6 +874,10 @@ static int sctp_inet6_send_verify(struct sctp_sock *opt, union sctp_addr *addr) dev =dev_get_by_index (addr->v6.sin6_scope_id);if (!dev)return 0 ; +if (!ipv6_chk_addr (&addr->v6.sin6_addr, dev,0 )) { +dev_put (dev); +return 0 ; + }dev_put (dev); } af = opt->pf->af;
net/sunrpc/auth_gss/svcauth_gss.c +5 -4
@@ -760,11 +760,12 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) new->h.flavour = &svcauthops_gss; new->pseudoflavor = pseudoflavor; + stat =0 ; test =auth_domain_lookup (name, &new->h); -if (test != &new->h) {/* XXX Duplicate registration? */ -auth_domain_put (&new->h); -/* dangling ref-count... */ - goto out; +if (test != &new->h) {/* Duplicate registration */ +auth_domain_put (test); +kfree (new->h.name); + goto out_free_dom; }return 0 ;
net/xfrm/xfrm_policy.c +1 -1
@@ -1971,7 +1971,7 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,if (last == first)break ; - last = last->u.next; + last = (struct xfrm_dst *)last->u.dst.next; last->child_mtu_cached = mtu; }
Quoted 16 lines · On Sat, 25 Aug 2007 15:38:10 +0000 Willy Tarreau wrote:
I've just released Linux 2.6.20.17.
As a reminder, it fixes these 3 security issues :
CVE-2007-3105
CVE-2007-3848
CVE-2007-3851I'll also be replying to this message with a copy of the patch between 2.6.20.16 and 2.6.20.17.
The patch and changelog will appear soon at the following locations:
ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17
Quoted 6 lines
Git repository:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.githttp://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git
Git repository through the gitweb interface:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git
I'm getting build errors:
x86_64 allyesconfig, allmodconfig:
drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Hello, Randy Dunlap.
On 25.08.2007 22:01 you said the following:
Quoted 7 lines
I'm getting build errors:
x86_64allyesconfig, allmodconfig:
drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function)net/bluetooth/rfcomm/tty.c:275: error: 'structrfcomm_dev' has no member named 'tty_dev'net/bluetooth/rfcomm/tty.c:278: error: 'structrfcomm_dev' has no member named 'tty_dev'
After applying patch-2.6.20.17, I'm getting build errors either:
net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add':net/bluetooth/rfcomm/tty.c:275: error: structure has no member named tty_dev' net/bluetooth/rfcomm/tty.c:278: error: structure has no member named tty_dev' make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1
make[2]: *** [net/bluetooth/rfcomm] Error 2
make[1]: *** [net/bluetooth] Error 2
make: *** [net] Error 2
Signature · 2 lines
Boris B. Zhmurov mailto: [email protected]
Marcel Holtmann
maintainerHi Boris,
Quoted 11 lines
Quoted 7 lines
I'm getting build errors:
x86_64allyesconfig, allmodconfig:
drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function)net/bluetooth/rfcomm/tty.c:275: error: 'structrfcomm_dev' has no member named 'tty_dev'net/bluetooth/rfcomm/tty.c:278: error: 'structrfcomm_dev' has no member named 'tty_dev'After applying patch-2.6.20.17, I'm getting build errors either:
Quoted 9 lines
net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add':net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev'net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev'
make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2
make[1]: *** [net/bluetooth] Error 2
make: *** [net] Error 2
the device_move() support was introduced with 2.6.21 so it seems we have a backport here that is not meant for this kernel.
Regards
Marcel
Hi Marcel,
Quoted 23 lines · Marcel Holtmann
Hi Boris,
Quoted 11 lines
Quoted 7 lines
I'm getting build errors:
x86_64allyesconfig, allmodconfig:
drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function)net/bluetooth/rfcomm/tty.c:275: error: 'structrfcomm_dev' has no member named 'tty_dev'net/bluetooth/rfcomm/tty.c:278: error: 'structrfcomm_dev' has no member named 'tty_dev'After applying patch-2.6.20.17, I'm getting build errors either:
Quoted 9 lines
net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add':net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev'net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev'
make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2
make[1]: *** [net/bluetooth] Error 2
make: *** [net] Error 2
Quoted 2 lines
the
device_move()support was introduced with 2.6.21 so it seems we have a backport here that is not meant for this kernel.
Eventhough I tried to be very careful this time, I got it wrong for these two patches affecting code I do not use :-( I'll fix all this mess ASAP in -18rc1.
Regards,
Willy