Linux 2.6.24.3
Subsystems (30)
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
It fixes a number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.24.2 and 2.6.24.3
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 arch/powerpc/platforms/chrp/pci.c | 4 - arch/powerpc/platforms/powermac/feature.c | 11 +++ arch/s390/lib/uaccess_std.c | 8 +- arch/sparc/lib/rwsem.S | 2 arch/sparc64/lib/rwsem.S | 2 arch/x86/mm/pageattr_64.c | 2 drivers/macintosh/smu.c | 25 +++++++ drivers/net/bonding/bond_main.c | 16 ++-- drivers/net/dl2k.h | 4 - drivers/net/pcmcia/smc91c92_cs.c | 12 +++ drivers/scsi/gdth.c | 9 ++ drivers/scsi/sd.c | 34 ++++------ drivers/usb/class/usblp.c | 1 fs/inotify_user.c | 2 fs/nfs/write.c | 20 +++++- fs/xfs/linux-2.6/xfs_file.c | 3 include/asm-powerpc/pmac_feature.h | 8 ++ include/linux/Kbuild | 1 include/linux/hrtimer.h | 2 include/linux/hugetlb.h | 1 include/linux/ktime.h | 2 kernel/audit.c | 10 ++- kernel/compat.c | 44 ++++++++++++- kernel/futex.c | 2 kernel/futex_compat.c | 2 kernel/hrtimer.c | 100 +++++++++++++++++------------- kernel/irq/chip.c | 20 +++++- kernel/posix-timers.c | 25 ++----- kernel/sysctl.c | 2 mm/hugetlb.c | 10 +++ mm/memory.c | 2 mm/slub.c | 3 net/bluetooth/hci_sysfs.c | 48 +++++++++++--- net/ipv4/fib_hash.c | 47 +++++++++----- net/ipv4/fib_trie.c | 57 ++++++++++------- net/ipv4/inet_diag.c | 11 +-- net/ipv4/ip_output.c | 4 - net/ipv4/ipcomp.c | 5 + net/ipv4/sysctl_net_ipv4.c | 2 net/ipv4/xfrm4_tunnel.c | 2 net/ipv6/ip6_output.c | 4 - net/ipv6/ipcomp6.c | 5 + net/netfilter/nf_conntrack_proto_tcp.c | 35 ++++++++-- net/sched/em_meta.c | 10 +-- net/sched/ematch.c | 5 - security/selinux/ss/services.c | 1 47 files changed, 434 insertions(+), 193 deletions(-)
Summary of changes from v2.6.24.2 to v2.6.24.3
==============================================
Al Viro (1):
Fix dl2k constants
Arnaldo Carvalho de Melo (1):
INET_DIAG: Fix inet_diag_lock_handler error path.
Benjamin Herrenschmidt (1):
Disable G5 NAP mode during SMU commands on U3
Boaz Harrosh (1):
SCSI: gdth: scan for scsi devices
Christoph Lameter (1):
SLUB: Deal with annoying gcc warning on kfree()
Chuck Ebbert (1):
PCMCIA: Fix station address detection in smc
Dave Young (1):
BLUETOOTH: Add conn add/del workqueues to avoid connection fail.
David Chinner (1):
XFS: Fix oops in xfs_file_readdir()
David Miller (1):
SPARC/SPARC64: Fix usage of .section .sched.text in assembler code.
Greg Kroah-Hartman (1):
Linux 2.6.24.3
Heiko Carstens (1):
S390: Fix futex_atomic_cmpxchg_std inline assembly.
Herbert Xu (4):
IPCOMP: Fix reception of incompressible packets
IPCOMP: Fetch nexthdr before ipch is destroyed
INET: Prevent out-of-sync truesize on ip_fragment slow path
AUDIT: Increase skb->truesize in audit_expand
Ingo Molnar (1):
x86_64: CPA, fix cache attribute inconsistency bug
James Bottomley (1):
SCSI: sd: handle bad lba in sense information
Jay Vosburgh (1):
bonding: fix NULL pointer deref in startup processing
Jonathan Corbet (1):
Be more robust about bad arguments in get_user_pages()
Jozsef Kadlecsik (1):
NETFILTER: nf_conntrack_tcp: conntrack reopening fix
Julian Anastasov (2):
IPV4: fib_trie: apply fixes from fib_hash
IPV4: fib: fix route replacement, fib_info is shared
Nishanth Aravamudan (1):
hugetlb: add locking for overcommit sysctl
Olaf Hering (1):
POWERPC: Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
Oleg Nesterov (2):
hrtimer: fix *rmtp handling in hrtimer_nanosleep()
hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
Oliver Neukum (1):
USB: fix pm counter leak in usblp
Paul Moore (1):
SELinux: Fix double free in selinux_netlbl_sock_setsid()
Shan Wei (1):
TCP: Fix a bug in strategy_allowed_congestion_control
Stephen Hemminger (3):
TC: oops in em_meta
PKT_SCHED: ematch: oops from uninitialized variable (resend)
NET: Add if_addrlabel.h to sanitized headers.
Thomas Gleixner (3):
hrtimer: check relative timeouts for overflow
hrtimer: catch expired CLOCK_REALTIME timers early
genirq: do not leave interupts enabled on free_irq
Trond Myklebust (1):
NFS: Fix a potential file corruption issue when writing
Ulisses Furquim (1):
inotify: fix check for one-shot watches before destroying them
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 24 -EXTRAVERSION = .2 +EXTRAVERSION = .3 NAME = Err Metey! A Heury Beelge-a Ret! # *DOCUMENTATION*
arch/powerpc/platforms/chrp/pci.c +2 -2
@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,* mode as well. The same fixup must be done to the class-code property in * the IDE node /pci@80000000/ide@C,1 */ -static void __devinit chrp_pci_fixup_vt8231_ata (struct pci_dev *viaide) +static void chrp_pci_fixup_vt8231_ata (struct pci_dev *viaide) {u8 progif;struct pci_dev *viaisa;
@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)pci_dev_put (viaisa); } -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_1 , chrp_pci_fixup_vt8231_ata); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_1 , chrp_pci_fixup_vt8231_ata);
arch/powerpc/platforms/powermac/feature.c +10 -1
@@ -2565,6 +2565,8 @@ static void __init probe_uninorth(void)/* Locate core99 Uni-N */ uninorth_node =of_find_node_by_name (NULL ,"uni-n" ); + uninorth_maj =1 ; +/* Locate G5 u3 */ if (uninorth_node ==NULL ) { uninorth_node =of_find_node_by_name (NULL ,"u3" );
@@ -2575,8 +2577,10 @@ static void __init probe_uninorth(void) uninorth_node =of_find_node_by_name (NULL ,"u4" ); uninorth_maj =4 ; } -if (uninorth_node ==NULL ) +if (uninorth_node ==NULL ) { + uninorth_maj =0 ;return ; + } addrp =of_get_property (uninorth_node,"reg" ,NULL );if (addrp ==NULL )
@@ -3029,3 +3033,8 @@ void pmac_resume_agp_for_card(struct pci_dev *dev)pmac_agp_resume (pmac_agp_bridge); }EXPORT_SYMBOL (pmac_resume_agp_for_card); + +int pmac_get_uninorth_variant (void ) +{ +return uninorth_maj; +}
arch/s390/lib/uaccess_std.c +4 -4
@@ -293,10 +293,10 @@ int futex_atomic_cmpxchg_std(int __user *uaddr, int oldval, int newval) asmvolatile (" sacf 256\n" -" cs %1,%4,0(%5)\n" -"0: lr %0,%1\n" -"1: sacf 0\n" - EX_TABLE(0b,1b) +"0: cs %1,%4,0(%5)\n" +"1: lr %0,%1\n" +"2: sacf 0\n" + EX_TABLE(0b,2b) EX_TABLE(1b,2b) : "=d" (ret), "+d" (oldval), "=m" (*uaddr) : "0" (-EFAULT), "d" (newval), "a" (uaddr), "m" (*uaddr) : "cc", "memory" );
arch/sparc/lib/rwsem.S +1 -1
@@ -7,7 +7,7 @@ #include <asm/ptrace.h> #include <asm/psr.h> - .section .sched.text + .section .sched.text, "ax" .align 4 .globl ___down_read
arch/sparc64/lib/rwsem.S +1 -1
@@ -6,7 +6,7 @@ #include <asm/rwsem-const.h> - .section .sched.text + .section .sched.text, "ax" .globl __down_read __down_read:
arch/x86/mm/pageattr_64.c +1 -1
@@ -207,7 +207,7 @@ int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)if (__pa (address) <KERNEL_TEXT_SIZE ) {unsigned long addr2;pgprot_t prot2; - addr2 = __START_KERNEL_map +__pa (address); + addr2 = __START_KERNEL_map +__pa (address) - phys_base;/* Make sure the kernel mappings stay executable */ prot2 =pte_pgprot (pte_mkexec (pfn_pte (0 , prot))); err = __change_page_attr(addr2, pfn, prot2,
drivers/macintosh/smu.c +24 -1
@@ -85,6 +85,7 @@ struct smu_device {u32 cmd_buf_abs;/* command buffer absolute */ struct list_head cmd_list;struct smu_cmd *cmd_cur;/* pending command */ +int broken_nap;struct list_head cmd_i2c_list;struct smu_i2c_cmd *cmd_i2c_cur;/* pending i2c command */ struct timer_list i2c_timer;
@@ -135,6 +136,19 @@ static void smu_start_cmd(void) fend = faddr + smu->cmd_buf->length +2 ;flush_inval_dcache_range (faddr, fend); + +/* We also disable NAP mode for the duration of the command +* on U3 based machines. +* This is slightly racy as it can be written back to 1 by a sysctl +* but that never happens in practice. There seem to be an issue with +* U3 based machines such as the iMac G5 where napping for the +* whole duration of the command prevents the SMU from fetching it +* from memory. This might be related to the strange i2c based +* mechanism the SMU uses to access memory. +*/ +if (smu->broken_nap) + powersave_nap =0 ; +/* This isn't exactly a DMA mapping here, I suspect * the SMU is actually communicating with us via i2c to the * northbridge or the CPU to access RAM.
@@ -211,6 +225,10 @@ static irqreturn_t smu_db_intr(int irq, void *arg) misc = cmd->misc;mb (); cmd->status = rc; + +/* Re-enable NAP mode */ +if (smu->broken_nap) + powersave_nap =1 ; bail:/* Start next command if any */ smu_start_cmd ();
@@ -461,7 +479,7 @@ int __init smu_init (void)if (np ==NULL )return -ENODEV ; -printk (KERN_INFO "SMU driver %s %s\n" ,VERSION ,AUTHOR ); +printk (KERN_INFO "SMU: Driver %s %s\n" ,VERSION ,AUTHOR );if (smu_cmdbuf_abs ==0 ) {printk (KERN_ERR "SMU: Command buffer not allocated !\n" );
@@ -533,6 +551,11 @@ int __init smu_init (void) goto fail; } +/* U3 has an issue with NAP mode when issuing SMU commands */ + smu->broken_nap =pmac_get_uninorth_variant () <4 ; +if (smu->broken_nap) +printk (KERN_INFO "SMU: using NAP mode workaround\n" ); + sys_ctrler =SYS_CTRLER_SMU ;return 0 ;
drivers/net/bonding/bond_main.c +9 -7
@@ -4883,14 +4883,16 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbonddown_write (&bonding_rwsem);/* Check to see if the bond already exists. */ -list_for_each_entry_safe (bond, nxt, &bond_dev_list, bond_list) -if (strnicmp (bond->dev->name, name,IFNAMSIZ ) ==0 ) { - printk(KERN_ERR DRV_NAME +if (name) { +list_for_each_entry_safe (bond, nxt, &bond_dev_list, bond_list) +if (strnicmp (bond->dev->name, name,IFNAMSIZ ) ==0 ) { + printk(KERN_ERR DRV_NAME": cannot add bond %s; it already exists\n" , - name); - res = -EPERM ; - goto out_rtnl; - } + name); + res = -EPERM ; + goto out_rtnl; + } + } bond_dev =alloc_netdev (sizeof (struct bonding ), name ? name :"" , ether_setup);
drivers/net/dl2k.h +2 -2
@@ -388,8 +388,8 @@ enum _mii_mssr {MII_MSSR_CFG_RES =0x4000 ,MII_MSSR_LOCAL_RCV_STATUS =0x2000 ,MII_MSSR_REMOTE_RCVR =0x1000 , -MII_MSSR_LP_1000BT_HD =0x0800 , -MII_MSSR_LP_1000BT_FD =0x0400 , +MII_MSSR_LP_1000BT_FD =0x0800 , +MII_MSSR_LP_1000BT_HD =0x0400 , MII_MSSR_IDLE_ERR_COUNT = 0x00ff, };
drivers/net/pcmcia/smc91c92_cs.c +10 -2
@@ -559,8 +559,16 @@ static int mhz_setup(struct pcmcia_device *link)/* Read the station address from the CIS. It is stored as the last (fourth) string in the Version 1 Version/ID tuple. */ -if (link->prod_id[3 ]) { - station_addr = link->prod_id[3 ]; + tuple->DesiredTuple =CISTPL_VERS_1 ; +if (first_tuple (link, tuple, parse) !=CS_SUCCESS ) { + rc =-1 ; + goto free_cfg_mem; + } +/* Ugh -- the EM1144 card has two VERS_1 tuples!?! */ +if (next_tuple (link, tuple, parse) !=CS_SUCCESS ) +first_tuple (link, tuple, parse); +if (parse->version_1.ns >3 ) { + station_addr = parse->version_1.str + parse->version_1.ofs[3 ];if (cvt_ascii_address (dev, station_addr) ==0 ) { rc =0 ; goto free_cfg_mem;
drivers/scsi/gdth.c +9 -0
@@ -4838,6 +4838,9 @@ static int __init gdth_isa_probe_one(ulong32 isa_bios)if (error) goto out_free_coal_stat;list_add_tail (&ha->list, &gdth_instances); + +scsi_scan_host (shp); +return 0 ; out_free_coal_stat:
@@ -4965,6 +4968,9 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot)if (error) goto out_free_coal_stat;list_add_tail (&ha->list, &gdth_instances); + +scsi_scan_host (shp); +return 0 ; out_free_ccb_phys:
@@ -5102,6 +5108,9 @@ static int __init gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)if (error) goto out_free_coal_stat;list_add_tail (&ha->list, &gdth_instances); + +scsi_scan_host (shp); +return 0 ; out_free_coal_stat:
drivers/scsi/sd.c +16 -18
@@ -907,6 +907,7 @@ static int sd_done(struct scsi_cmnd *SCpnt)unsigned int xfer_size = SCpnt->request_bufflen;unsigned int good_bytes = result ?0 : xfer_size;u64 start_lba = SCpnt->request->sector; +u64 end_lba = SCpnt->request->sector + (xfer_size /512 );u64 bad_lba;struct scsi_sense_hdr sshdr;int sense_valid =0 ;
@@ -945,26 +946,23 @@ static int sd_done(struct scsi_cmnd *SCpnt) goto out;if (xfer_size <= SCpnt->device->sector_size) goto out; -switch (SCpnt->device->sector_size) { -case 256 : +if (SCpnt->device->sector_size <512 ) { +/* only legitimate sector_size here is 256 */ start_lba <<=1 ; -break ; -case 512 : -break ; -case 1024 : - start_lba >>=1 ; -break ; -case 2048 : - start_lba >>=2 ; -break ; -case 4096 : - start_lba >>=3 ; -break ; -default : -/* Print something here with limiting frequency. */ - goto out; -break ; + end_lba <<=1 ; + }else { +/* be careful ... don't want any overflows */ +u64 factor = SCpnt->device->sector_size /512 ; +do_div (start_lba, factor); +do_div (end_lba, factor); } + +if (bad_lba < start_lba || bad_lba >= end_lba) +/* the bad lba was reported incorrectly, we have +* no idea where the error is +*/ + goto out; +/* This computation should always be done in terms of * the resolution of the device's medium. */
drivers/usb/class/usblp.c +1 -0
@@ -428,6 +428,7 @@ static int usblp_open(struct inode *inode, struct file *file) usblp->rcomplete =0 ;if (handle_bidir (usblp) <0 ) { +usb_autopm_put_interface (intf); usblp->used =0 ; file->private_data =NULL ; retval = -EIO ;
fs/inotify_user.c +1 -1
@@ -269,7 +269,7 @@ static void inotify_dev_queue_event(struct inotify_watch *w, u32 wd, u32 mask,/* we can safely put the watch as we don't reference it while * generating the event */ -if (mask &IN_IGNORED || mask &IN_ONESHOT ) +if (mask &IN_IGNORED || w->mask &IN_ONESHOT )put_inotify_watch (w);/* final put */ /* coalescing: drop this event if it is a dupe of the previous */
fs/nfs/write.c +17 -3
@@ -701,6 +701,17 @@ int nfs_flush_incompatible(struct file *file, struct page *page) }/* +* If the page cache is marked as unsafe or invalid, then we can't rely on +* the PageUptodate() flag. In this case, we will need to turn off +* write optimisations that depend on the page contents being correct. +*/ +static int nfs_write_pageuptodate (struct page *page,struct inode *inode) +{ +return PageUptodate (page) && + !(NFS_I (inode)->cache_validity & (NFS_INO_REVAL_PAGECACHE |NFS_INO_INVALID_DATA )); +} + +/* * Update and possibly write a cached page of an NFS file. * * XXX: Keep an eye on generic_file_read to make sure it doesn't do bad
@@ -721,10 +732,13 @@ int nfs_updatepage(struct file *file, struct page *page, (long long)(page_offset(page) +offset));/* If we're not using byte range locks, and we know the page -* is entirely in cache, it may be more efficient to avoid -* fragmenting write requests. +* is up to date, it may be more efficient to extend the write +* to cover the entire page in order to avoid fragmentation +* inefficiencies. */ -if (PageUptodate (page) && inode->i_flock ==NULL && !(file->f_mode &O_SYNC )) { +if (nfs_write_pageuptodate (page, inode) && + inode->i_flock ==NULL && + !(file->f_mode &O_SYNC )) { count =max (count + offset,nfs_page_length (page)); offset =0 ; }
fs/xfs/linux-2.6/xfs_file.c +1 -2
@@ -350,8 +350,8 @@ xfs_file_readdir( size = buf.used; de = (struct hack_dirent *)buf.dirent; - curr_offset = de->offset/* & 0x7fffffff */ ;while (size >0 ) { + curr_offset = de->offset/* & 0x7fffffff */ ;if (filldir (dirent, de->name, de->namlen, curr_offset &0x7fffffff , de->ino, de->d_type)) {
@@ -362,7 +362,6 @@ xfs_file_readdir( sizeof(u64)); size -= reclen; de = (struct hack_dirent *)((char *)de + reclen); - curr_offset = de->offset/* & 0x7fffffff */ ; } }
include/asm-powerpc/pmac_feature.h +8 -0
@@ -392,6 +392,14 @@ extern u32 __iomem *uninorth_base;#define UN_BIS (r,v) (UN_OUT((r), UN_IN(r) | (v)))#define UN_BIC (r,v) (UN_OUT((r), UN_IN(r) & ~(v))) +/* Uninorth variant: +* +* 0 = not uninorth +* 1 = U1.x or U2.x +* 3 = U3 +* 4 = U4 +*/ +extern int pmac_get_uninorth_variant (void );#endif /* __ASM_POWERPC_PMAC_FEATURE_H */ #endif /* __KERNEL__ */
include/linux/Kbuild +1 -0
@@ -217,6 +217,7 @@ unifdef-y += i2o-dev.h unifdef-y += icmp.h unifdef-y += icmpv6.h unifdef-y += if_addr.h +unifdef-y += if_addrlabel.h unifdef-y += if_arp.h unifdef-y += if_bridge.h unifdef-y += if_ec.h
include/linux/hrtimer.h +1 -1
@@ -300,7 +300,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);/* Precise sleep: */ extern long hrtimer_nanosleep (struct timespec *rqtp, -struct timespec *rmtp, +struct timespec __user *rmtp,const enum hrtimer_mode mode,const clockid_t clockid);extern long hrtimer_nanosleep_restart (struct restart_block *restart_block);
include/linux/hugetlb.h +1 -0
@@ -17,6 +17,7 @@ static inline int is_vm_hugetlb_page(struct vm_area_struct *vma) }int hugetlb_sysctl_handler (struct ctl_table *,int ,struct file *,void __user *,size_t *,loff_t *); +int hugetlb_overcommit_handler (struct ctl_table *,int ,struct file *,void __user *,size_t *,loff_t *);int hugetlb_treat_movable_handler (struct ctl_table *,int ,struct file *,void __user *,size_t *,loff_t *);int copy_hugetlb_page_range (struct mm_struct *,struct mm_struct *,struct vm_area_struct *);int follow_hugetlb_page (struct mm_struct *,struct vm_area_struct *,struct page **,struct vm_area_struct **,unsigned long *,int *,int ,int );
include/linux/ktime.h +2 -0
@@ -310,6 +310,8 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)return ktime_sub_ns (kt, usec *1000 ); } +extern ktime_t ktime_add_safe (const ktime_t lhs,const ktime_t rhs); +/* * The resolution of the clocks. The resolution value is returned in * the clock_getres() system call to give application programmers an
kernel/audit.c +7 -3
@@ -1200,13 +1200,17 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,static inline int audit_expand (struct audit_buffer *ab,int extra) {struct sk_buff *skb = ab->skb; -int ret =pskb_expand_head (skb,skb_headroom (skb), extra, - ab->gfp_mask); +int oldtail =skb_tailroom (skb); +int ret =pskb_expand_head (skb,0 , extra, ab->gfp_mask); +int newtail =skb_tailroom (skb); +if (ret <0 ) {audit_log_lost ("out of memory in audit_expand" );return 0 ; } -return skb_tailroom (skb); + + skb->truesize += newtail - oldtail; +return newtail; }/*
kernel/compat.c +40 -4
61 lines not on this page · raw message
kernel/futex.c +1 -1
@@ -2094,7 +2094,7 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val, t =timespec_to_ktime (ts);if (cmd ==FUTEX_WAIT ) - t =ktime_add (ktime_get (), t); + t =ktime_add_safe (ktime_get (), t); tp = &t; }/*
kernel/futex_compat.c +1 -1
@@ -175,7 +175,7 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, t =timespec_to_ktime (ts);if (cmd ==FUTEX_WAIT ) - t =ktime_add (ktime_get (), t); + t =ktime_add_safe (ktime_get (), t); tp = &t; }if (cmd ==FUTEX_REQUEUE || cmd ==FUTEX_CMP_REQUEUE )
kernel/hrtimer.c +59 -41
181 lines not on this page · raw message
kernel/irq/chip.c +19 -1
@@ -246,6 +246,17 @@ static unsigned int default_startup(unsigned int irq) }/* +* default shutdown function +*/ +static void default_shutdown (unsigned int irq) +{ +struct irq_desc *desc = irq_desc + irq; + + desc->chip->mask (irq); + desc->status |=IRQ_MASKED ; +} + +/* * Fixup enable/disable function pointers */ void irq_chip_set_defaults (struct irq_chip *chip)
@@ -256,8 +267,15 @@ void irq_chip_set_defaults(struct irq_chip *chip) chip->disable = default_disable;if (!chip->startup) chip->startup = default_startup; +/* +* We use chip->disable, when the user provided its own. When +* we have default_disable set for chip->disable, then we need +* to use default_shutdown, otherwise the irq line is not +* disabled on free_irq(): +*/ if (!chip->shutdown) - chip->shutdown = chip->disable; + chip->shutdown = chip->disable != default_disable ? + chip->disable : default_shutdown;if (!chip->name) chip->name = chip->typename;if (!chip->end)
kernel/posix-timers.c +8 -17
@@ -766,9 +766,11 @@ common_timer_set(struct k_itimer *timr, int flags,/* SIGEV_NONE timers are not queued ! See common_timer_get */ if (((timr->it_sigev_notify & ~SIGEV_THREAD_ID ) ==SIGEV_NONE )) {/* Setup correct expiry time for relative timers */ -if (mode ==HRTIMER_MODE_REL ) - timer->expires =ktime_add (timer->expires, - timer->base->get_time ()); +if (mode ==HRTIMER_MODE_REL ) { + timer->expires = +ktime_add_safe (timer->expires, + timer->base->get_time ()); + }return 0 ; }
@@ -981,20 +983,9 @@ sys_clock_getres(const clockid_t which_clock, struct timespec __user *tp)static int common_nsleep (const clockid_t which_clock,int flags,struct timespec *tsave,struct timespec __user *rmtp) { -struct timespec rmt; -int ret; - - ret =hrtimer_nanosleep (tsave, rmtp ? &rmt :NULL , - flags &TIMER_ABSTIME ? -HRTIMER_MODE_ABS :HRTIMER_MODE_REL , - which_clock); - -if (ret && rmtp) { -if (copy_to_user (rmtp, &rmt,sizeof (*rmtp))) -return -EFAULT ; - } - -return ret; +return hrtimer_nanosleep (tsave, rmtp, flags &TIMER_ABSTIME ? +HRTIMER_MODE_ABS :HRTIMER_MODE_REL , + which_clock); }asmlinkage long
kernel/sysctl.c +1 -1
@@ -910,7 +910,7 @@ static struct ctl_table vm_table[] = { .data = &nr_overcommit_huge_pages, .maxlen = sizeof(nr_overcommit_huge_pages), .mode = 0644, - .proc_handler = &proc_doulongvec_minmax, + .proc_handler = &hugetlb_overcommit_handler, },#endif {
mm/hugetlb.c +10 -0
@@ -605,6 +605,16 @@ int hugetlb_treat_movable_handler(struct ctl_table *table, int write, return 0; } +int hugetlb_overcommit_handler (struct ctl_table *table,int write, +struct file *file,void __user *buffer, +size_t *length,loff_t *ppos) +{ +spin_lock (&hugetlb_lock); +proc_doulongvec_minmax (table, write, file, buffer, length, ppos); +spin_unlock (&hugetlb_lock); +return 0 ; +} +#endif /* CONFIG_SYSCTL */ int hugetlb_report_meminfo (char *buf)
mm/memory.c +2 -0
@@ -980,6 +980,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,int i;unsigned int vm_flags; +if (len <=0 ) +return 0 ;/* * Require read or write permissions. * If 'force' is set, we only require the "MAY" flags.
mm/slub.c +2 -1
@@ -2592,6 +2592,7 @@ EXPORT_SYMBOL(ksize);void kfree (const void *x) {struct page *page; +void *object = (void *)x;if (unlikely (ZERO_OR_NULL_PTR (x)))return ;
@@ -2601,7 +2602,7 @@ void kfree(const void *x)put_page (page);return ; } -slab_free (page->slab, page, (void *)x,__builtin_return_address (0 )); +slab_free (page->slab, page, object,__builtin_return_address (0 )); }EXPORT_SYMBOL (kfree);
net/bluetooth/hci_sysfs.c +37 -11
92 lines not on this page · raw message
net/ipv4/fib_hash.c +31 -16
70 lines not on this page · raw message
net/ipv4/fib_trie.c +36 -21
92 lines not on this page · raw message
net/ipv4/inet_diag.c +6 -5
@@ -259,8 +259,10 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,const struct inet_diag_handler *handler; handler =inet_diag_lock_handler (nlh->nlmsg_type); -if (!handler) -return -ENOENT ; +if (IS_ERR (handler)) { + err =PTR_ERR (handler); + goto unlock; + } hashinfo = handler->idiag_hashinfo; err = -EINVAL ;
@@ -708,8 +710,8 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)struct inet_hashinfo *hashinfo; handler =inet_diag_lock_handler (cb->nlh->nlmsg_type); -if (!handler) - goto no_handler; +if (IS_ERR (handler)) + goto unlock; hashinfo = handler->idiag_hashinfo;
@@ -838,7 +840,6 @@ done: cb->args[2 ] = num; unlock:inet_diag_unlock_handler (handler); -no_handler:return skb->len; }
net/ipv4/ip_output.c +3 -1
@@ -462,6 +462,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))if (skb_shinfo (skb)->frag_list) {struct sk_buff *frag;int first_len =skb_pagelen (skb); +int truesizes =0 ; if (first_len - hlen > mtu || ((first_len - hlen) & 7) ||
@@ -485,7 +486,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))sock_hold (skb->sk); frag->sk = skb->sk; frag->destructor = sock_wfree; - skb->truesize -= frag->truesize; + truesizes += frag->truesize; } }
@@ -496,6 +497,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*)) frag =skb_shinfo (skb)->frag_list;skb_shinfo (skb)->frag_list =NULL ; skb->data_len = first_len -skb_headlen (skb); + skb->truesize -= truesizes; skb->len = first_len; iph->tot_len =htons (first_len); iph->frag_off =htons (IP_MF );
net/ipv4/ipcomp.c +4 -1
@@ -74,6 +74,7 @@ out:static int ipcomp_input (struct xfrm_state *x,struct sk_buff *skb) { +int nexthdr;int err = -ENOMEM ;struct ip_comp_hdr *ipch;
@@ -84,13 +85,15 @@ static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)/* Remove ipcomp header and decompress original payload */ ipch = (void *)skb->data; + nexthdr = ipch->nexthdr; + skb->transport_header = skb->network_header +sizeof (*ipch);__skb_pull (skb,sizeof (*ipch)); err =ipcomp_decompress (x, skb);if (err) goto out; - err = ipch->nexthdr; + err = nexthdr; out:return err;
net/ipv4/sysctl_net_ipv4.c +1 -1
@@ -248,7 +248,7 @@ static int strategy_allowed_congestion_control(ctl_table *table, int __user *namtcp_get_available_congestion_control (tbl.data, tbl.maxlen); ret =sysctl_string (&tbl, name, nlen, oldval, oldlenp, newval, newlen); -if (ret ==0 && newval && newlen) +if (ret ==1 && newval && newlen) ret =tcp_set_allowed_congestion_control (tbl.data);kfree (tbl.data);
net/ipv4/xfrm4_tunnel.c +1 -1
@@ -50,7 +50,7 @@ static struct xfrm_type ipip_type = {static int xfrm_tunnel_rcv (struct sk_buff *skb) { -return xfrm4_rcv_spi (skb,IPPROTO_IP ,ip_hdr (skb)->saddr); +return xfrm4_rcv_spi (skb,IPPROTO_IPIP ,ip_hdr (skb)->saddr); }static int xfrm_tunnel_err (struct sk_buff *skb,u32 info)
net/ipv6/ip6_output.c +3 -1
@@ -609,6 +609,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))if (skb_shinfo (skb)->frag_list) {int first_len =skb_pagelen (skb); +int truesizes =0 ; if (first_len - hlen > mtu || ((first_len - hlen) & 7) ||
@@ -631,7 +632,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))sock_hold (skb->sk); frag->sk = skb->sk; frag->destructor = sock_wfree; - skb->truesize -= frag->truesize; + truesizes += frag->truesize; } }
@@ -662,6 +663,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) first_len =skb_pagelen (skb); skb->data_len = first_len -skb_headlen (skb); + skb->truesize -= truesizes; skb->len = first_len;ipv6_hdr (skb)->payload_len =htons (first_len -sizeof (struct ipv6hdr ));
net/ipv6/ipcomp6.c +4 -1
@@ -64,6 +64,7 @@ static LIST_HEAD(ipcomp6_tfms_list);static int ipcomp6_input (struct xfrm_state *x,struct sk_buff *skb) { +int nexthdr;int err = -ENOMEM ;struct ip_comp_hdr *ipch;int plen, dlen;
@@ -79,6 +80,8 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)/* Remove ipcomp header and decompress original payload */ ipch = (void *)skb->data; + nexthdr = ipch->nexthdr; + skb->transport_header = skb->network_header +sizeof (*ipch);__skb_pull (skb,sizeof (*ipch));
@@ -108,7 +111,7 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb) skb->truesize += dlen - plen;__skb_put (skb, dlen - plen);skb_copy_to_linear_data (skb, scratch, dlen); - err = ipch->nexthdr; + err = nexthdr; out_put_cpu:put_cpu ();
net/netfilter/nf_conntrack_proto_tcp.c +27 -8
@@ -135,7 +135,7 @@ enum tcp_bit_set {* CLOSE_WAIT: ACK seen (after FIN) * LAST_ACK: FIN seen (after FIN) * TIME_WAIT: last ACK seen -* CLOSE: closed connection +* CLOSE: closed connection (RST) * * LISTEN state is not used. *
@@ -834,8 +834,21 @@ static int tcp_packet(struct nf_conn *conntrack,case TCP_CONNTRACK_SYN_SENT :if (old_state <TCP_CONNTRACK_TIME_WAIT )break ; -if ((conntrack->proto.tcp.seen[!dir].flags & -IP_CT_TCP_FLAG_CLOSE_INIT ) +/* RFC 1122: "When a connection is closed actively, +* it MUST linger in TIME-WAIT state for a time 2xMSL +* (Maximum Segment Lifetime). However, it MAY accept +* a new SYN from the remote TCP to reopen the connection +* directly from TIME-WAIT state, if..." +* We ignore the conditions because we are in the +* TIME-WAIT state anyway. +* +* Handle aborted connections: we and the server +* think there is an existing connection but the client +* aborts it and starts a new one. +*/ +if (((conntrack->proto.tcp.seen[dir].flags + | conntrack->proto.tcp.seen[!dir].flags) + &IP_CT_TCP_FLAG_CLOSE_INIT ) || (conntrack->proto.tcp.last_dir == dir && conntrack->proto.tcp.last_index ==TCP_RST_SET )) {/* Attempt to reopen a closed/aborted connection.
@@ -848,18 +861,25 @@ static int tcp_packet(struct nf_conn *conntrack, }/* Fall through */ case TCP_CONNTRACK_IGNORE : -/* Ignored packets: +/* Ignored packets: +* +* Our connection entry may be out of sync, so ignore +* packets which may signal the real connection between +* the client and the server. * * a) SYN in ORIGINAL * b) SYN/ACK in REPLY * c) ACK in reply direction after initial SYN in original. +* +* If the ignored packet is invalid, the receiver will send +* a RST we'll catch below. */ if (index ==TCP_SYNACK_SET && conntrack->proto.tcp.last_index ==TCP_SYN_SET && conntrack->proto.tcp.last_dir != dir &&ntohl (th->ack_seq) == conntrack->proto.tcp.last_end) { -/* This SYN/ACK acknowledges a SYN that we earlier +/* b) This SYN/ACK acknowledges a SYN that we earlier * ignored as invalid. This means that the client and * the server are both in sync, while the firewall is * not. We kill this session and block the SYN/ACK so
@@ -884,7 +904,7 @@ static int tcp_packet(struct nf_conn *conntrack,write_unlock_bh (&tcp_lock);if (LOG_INVALID (IPPROTO_TCP ))nf_log_packet (pf,0 , skb,NULL ,NULL ,NULL , -"nf_ct_tcp: invalid packed ignored " ); +"nf_ct_tcp: invalid packet ignored " );return NF_ACCEPT ;case TCP_CONNTRACK_MAX :/* Invalid packet */
@@ -938,8 +958,7 @@ static int tcp_packet(struct nf_conn *conntrack, conntrack->proto.tcp.state = new_state;if (old_state != new_state - && (new_state ==TCP_CONNTRACK_FIN_WAIT - || new_state ==TCP_CONNTRACK_CLOSE )) + && new_state ==TCP_CONNTRACK_FIN_WAIT ) conntrack->proto.tcp.seen[dir].flags |=IP_CT_TCP_FLAG_CLOSE_INIT ; timeout = conntrack->proto.tcp.retrans >= nf_ct_tcp_max_retrans && *tcp_timeouts[new_state] > nf_ct_tcp_timeout_max_retrans
net/sched/em_meta.c +6 -4
@@ -719,11 +719,13 @@ static int em_meta_match(struct sk_buff *skb, struct tcf_ematch *m,static inline void meta_delete (struct meta_match *meta) { -struct meta_type_ops *ops =meta_type_ops (&meta->lvalue); +if (meta) { +struct meta_type_ops *ops =meta_type_ops (&meta->lvalue); -if (ops && ops->destroy) { - ops->destroy (&meta->lvalue); - ops->destroy (&meta->rvalue); +if (ops && ops->destroy) { + ops->destroy (&meta->lvalue); + ops->destroy (&meta->rvalue); + } }kfree (meta);
net/sched/ematch.c +2 -3
@@ -305,10 +305,9 @@ int tcf_em_tree_validate(struct tcf_proto *tp, struct rtattr *rta,struct tcf_ematch_tree_hdr *tree_hdr;struct tcf_ematch *em; -if (!rta) { -memset (tree,0 ,sizeof (*tree)); +memset (tree,0 ,sizeof (*tree)); +if (!rta)return 0 ; - }if (rtattr_parse_nested (tb,TCA_EMATCH_TREE_MAX , rta) <0 ) goto errout;
security/selinux/ss/services.c +0 -1
@@ -2629,7 +2629,6 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) netlbl_sid_to_secattr_failure:POLICY_RDUNLOCK ; -netlbl_secattr_destroy (secattr); return rc; }#endif /* CONFIG_NETLABEL */
Quoted 6 lines · On Mon, 25 Feb 2008 17:00:24 -0800 Greg Kroah-Hartman wrote:
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
It fixes a number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
Quoted 7 lines
I'll also be replying to this message with a copy of the patch between 2.6.24.2 and 2.6.24.3
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summary
When HEADERS_CHECK=y:
make[3]: *** No rule to make target /local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by /local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2
---
~Randy
Quoted 3 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3
kernel.
Hi Greg, Stable people :)
Can you confirm you have the mips irq probe crash fix in your queue for the next stable release
See:
http://lkml.org/lkml/2008/2/24/255
Is there anymore I should do to help the process along?
Thanks
Samuel
Quoted 9 lines · Samuel Masham
Quoted 3 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3
kernel.Hi Greg, Stable people :)
Can you confirm you have the mips irq probe crash fix in your queue for the next stable release
Yes, you just sent this to me on Monday, give me at least a week to ignore it before you worried :)
It's in my queue, I'll let you know when I get to it.
thanks,
greg k-h
Quoted 2 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
Hi,
I can see the patch in http://www.kernel.org/pub/linux/kernel/v2.6/,
but no incremental patch in
http://www.kernel.org/pub/linux/kernel/v2.6/incr/. Is this due to some delay, or was is just not uploaded?
Regards,
Tino
Quoted 3 lines
no incremental patch in
http://www.kernel.org/pub/linux/kernel/v2.6/incr/. Is this due to some delay, or was is just not uploaded?
Would be really nice to have indeed.
Hello,
Quoted 5 lines · Tino Keitel
I can see the patch in http://www.kernel.org/pub/linux/kernel/v2.6/,
but no incremental patch in
http://www.kernel.org/pub/linux/kernel/v2.6/incr/. Is this due to some delay, or was is just not uploaded?
It seems that the 2->3 incremental patch was uploaded in /pub/linux/kernel/v2.6/ too.
Re: Linux 2.6.24.3 (incr patch missing)
In reply to Greg Kroah-HartmanQuoted 2 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
patch-2.6.24.2-3.* files are missing from http://www.kernel.org/pub/linux/kernel/v2.6/incr/
The 2.6.23.17 patches which were released at the same time are there, so it doesn't seem to be a case of kernel.org being behind.
Thanks,
Daniel
Re: Linux 2.6.24.3 (if_addrlabel.h HEADERS_CHECK failure)
In reply to Randy DunlapQuoted 7 lines · Randy Dunlap
Quoted 2 lines
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2
This appears to have been caused by the patch titled:
NET: Add if_addrlabel.h to sanitized headers.
The patch only adds the unifdef-y entry for this header file, however that header was only added after 2.6.24.
It seems that this patch was submitted to -stable in error. Stephen, can you confirm?
Thanks,
Daniel
Re: Linux 2.6.24.3 (if_addrlabel.h HEADERS_CHECK failure)
Quoted 11 lines · On Tue, 26 Feb 2008 14:38:47 +0000 Daniel Drake <[email protected]> wrote:
Quoted 7 lines · Randy Dunlap
Quoted 2 lines
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2This appears to have been caused by the patch titled:
Quoted 7 lines
NET: Add
if_addrlabel.hto sanitized headers.The patch only adds the unifdef-y entry for this header file, however that header was only added after 2.6.24.
It seems that this patch was submitted to -stable in error. Stephen, can you confirm?
The patch was meant for 2.6.25 only.
Re: Linux 2.6.24.3 (incr patch missing)
In reply to Daniel DrakeQuoted 9 lines · Daniel Drake
Quoted 2 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
patch-2.6.24.2-3.* files are missing from
http://www.kernel.org/pub/linux/kernel/v2.6/incr/The 2.6.23.17 patches which were released at the same time are there, so it doesn't seem to be a case of kernel.org being behind.
Sorry, for some reason I forgot to copy them there. I just did it and should show up in the mirrors in an hour or so. Please let me know if they don't.
thanks,
greg k-h
Re: [stable] Linux 2.6.24.3 (if_addrlabel.h HEADERS_CHECK failure)
In reply to Stephen HemmingerQuoted 16 lines · Stephen Hemminger
Quoted 13 lines · On Tue, 26 Feb 2008 14:38:47 +0000 Daniel Drake <[email protected]> wrote:
Quoted 7 lines · Randy Dunlap
Quoted 2 lines
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2This appears to have been caused by the patch titled:
NET: Add
if_addrlabel.hto sanitized headers.
Quoted 7 lines
Quoted 5 lines
The patch only adds the unifdef-y entry for this header file, however that header was only added after 2.6.24.
It seems that this patch was submitted to -stable in error. Stephen, can you confirm?
The patch was meant for 2.6.25 only.
So should it be reverted? David sent it to me for some reason :)
thanks,
greg k-h
Re: Linux 2.6.24.3 (incr patch missing)
In reply to Greg KHQuoted 8 lines · Greg KH
Quoted 7 lines · Daniel Drake
Quoted 2 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
patch-2.6.24.2-3.* files are missing from
http://www.kernel.org/pub/linux/kernel/v2.6/incr/
Quoted 6 lines
Quoted 2 lines
The 2.6.23.17 patches which were released at the same time are there, so it doesn't seem to be a case of kernel.org being behind.
Sorry, for some reason I forgot to copy them there. I just did it and should show up in the mirrors in an hour or so. Please let me know if they don't.
They were copied, but to /pub/linux/kernel/v2.6/ (where the older copy still is).
Quoted 3 lines
thanks,
greg k-h
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [stable] Linux 2.6.24.3 (if_addrlabel.h HEADERS_CHECK failure)
In reply to Greg KHQuoted 23 lines · On Tue, 26 Feb 2008 12:01:37 -0800 Greg KH <[email protected]> wrote:
Quoted 22 lines · Stephen Hemminger
Quoted 18 lines · On Tue, 26 Feb 2008 14:38:47 +0000 Daniel Drake <[email protected]> wrote:
Quoted 7 lines · Randy Dunlap
Quoted 2 lines
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2This appears to have been caused by the patch titled:
NET: Add
if_addrlabel.hto sanitized headers.The patch only adds the unifdef-y entry for this header file, however that header was only added after 2.6.24.
It seems that this patch was submitted to -stable in error. Stephen, can you confirm?
Quoted 7 lines
Quoted 1 line
The patch was meant for 2.6.25 only.
So should it be reverted? David sent it to me for some reason :)
thanks,
greg k-h
yes. please revert it for next build.
Re: Linux 2.6.24.3 (incr patch missing)
In reply to Adrian BunkQuoted 12 lines · Adrian Bunk
Quoted 11 lines · Greg KH
Quoted 9 lines · Daniel Drake
Quoted 2 lines · Greg Kroah-Hartman
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
patch-2.6.24.2-3.* files are missing from
http://www.kernel.org/pub/linux/kernel/v2.6/incr/The 2.6.23.17 patches which were released at the same time are there, so it doesn't seem to be a case of kernel.org being behind.
Quoted 6 lines
Quoted 3 lines
Sorry, for some reason I forgot to copy them there. I just did it and should show up in the mirrors in an hour or so. Please let me know if they don't.
They were copied, but to /pub/linux/kernel/v2.6/ (where the older copy still is).
Ah, that's what I get for doing 3 stable releases at once...
Thanks, I've now removed the files in the v2.6 directory, all should be sane now.
greg k-h
David Miller
maintainerRe: Linux 2.6.24.3 (if_addrlabel.h HEADERS_CHECK failure)
In reply to Stephen HemmingerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 26 Feb 2008 07:29:43 -0800
Quoted 8 lines
Quoted 5 lines · On Tue, 26 Feb 2008 14:38:47 +0000 Daniel Drake <[email protected]> wrote:
Randy Dunlap wrote:
This appears to have been caused by the patch titled:NET: Add
if_addrlabel.hto sanitized headers.
Quoted 7 lines
Quoted 5 lines
The patch only adds the unifdef-y entry for this header file, however that header was only added after 2.6.24.
It seems that this patch was submitted to -stable in error. Stephen, can you confirm?
The patch was meant for 2.6.25 only.
My bad, please revert :(
Quoted 16 lines · Randy Dunlap
Quoted 6 lines · On Mon, 25 Feb 2008 17:00:24 -0800 Greg Kroah-Hartman wrote:
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
It fixes a number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
Quoted 7 lines
I'll also be replying to this message with a copy of the patch between 2.6.24.2 and 2.6.24.3
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summary
Quoted 4 lines
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2
Is this a regression from 2.6.24.2? If so, any ideas which patch caused it?
thanks,
greg k-h
Quoted 17 lines · On Mon, 25 Feb 2008 20:15:45 -0800 Greg KH wrote:
Quoted 16 lines · Randy Dunlap
Quoted 13 lines · On Mon, 25 Feb 2008 17:00:24 -0800 Greg Kroah-Hartman wrote:
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
It fixes a number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.24.2 and 2.6.24.3
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summary
Quoted 6 lines
Quoted 4 lines
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2Is this a regression from 2.6.24.2?
Yes.
Quoted 1 line
If so, any ideas which patch caused it?
No, but I thought that we had already been thru this...
---
~Randy
David Miller
maintainerFrom: Greg KH <[email protected]>
Date: Mon, 25 Feb 2008 20:15:45 -0800
Quoted 7 lines
Quoted 4 lines
When HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2Is this a regression from 2.6.24.2? If so, any ideas which patch caused it?
Greg, look more carefully, it's because of the patch us networking folks asked you yesterday to revert.
Quoted 24 lines · Randy Dunlap
Quoted 22 lines · On Mon, 25 Feb 2008 20:15:45 -0800 Greg KH wrote:
Quoted 20 lines · Randy Dunlap
Quoted 6 lines · On Mon, 25 Feb 2008 17:00:24 -0800 Greg Kroah-Hartman wrote:
We (the -stable team) are announcing the release of the 2.6.24.3 kernel.
It fixes a number of different bugs and all users of the 2.6.24 series are encouraged to upgrade.
Quoted 7 lines
I'll also be replying to this message with a copy of the patch between 2.6.24.2 and 2.6.24.3
The updated 2.6.24.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.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.24.y.git;a=summaryWhen HEADERS_CHECK=y:
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2
Quoted 7 lines
Quoted 1 line
Is this a regression from 2.6.24.2?
Yes.
Quoted 1 line
If so, any ideas which patch caused it?
No, but I thought that we had already been thru this...
Ugh, sorry, too many trees/bugs/patches right now. I'll take care of this on friday when I get back home...
greg k-h
Quoted 5 lines · David Miller
From: Greg KH <[email protected]>
Date: Mon, 25 Feb 2008 20:15:45 -0800Quoted 2 lines
Quoted 2 lines
When HEADERS_CHECK=y:
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
make[3]: *** No rule to make target
/local/linsrc/linux-2.6.24.3/include/linux/if_addrlabel.h', needed by/local/linsrc/linux-2.6.24.3/usr/include/linux/if_addrlabel.h'. Stop. make[2]: *** [linux] Error 2Is this a regression from 2.6.24.2? If so, any ideas which patch caused it?
Greg, look more carefully, it's because of the patch us networking folks asked you yesterday to revert.
My appologies, you are correct, tough keeping track of this while at conferences...
I'll take care of it on Friday.
thanks,
greg k-h
Quoted 7 lines · Randy Dunlap
Quoted 1 line · On Mon, 25 Feb 2008 20:15:45 -0800 Greg KH wrote:
Is this a regression from 2.6.24.2?
Yes.
Quoted 1 line
If so, any ideas which patch caused it?
Which ever one that added this.
include/linux/Kbuild +1 -0
@@ -217,6 +217,7 @@ unifdef-y += i2o-dev.h unifdef-y += icmp.h unifdef-y += icmpv6.h unifdef-y += if_addr.h +unifdef-y += if_addrlabel.h unifdef-y += if_arp.h unifdef-y += if_bridge.h unifdef-y += if_ec.h