Linux 2.6.17.12
Subsystems (17)
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
I'll also be replying to this message with a copy of the patch between 2.6.17.11 and 2.6.17.12, as it is small enough to do so.
The updated 2.6.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.17.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 arch/ia64/sn/kernel/xpc_channel.c | 4 - arch/ia64/sn/kernel/xpc_main.c | 28 +++++---- arch/ia64/sn/kernel/xpc_partition.c | 24 ++------ arch/sparc64/mm/generic.c | 2 drivers/ide/pci/via82cxxx.c | 3 - drivers/md/dm-exception-store.c | 65 ++++++++++++++--------- drivers/md/dm-ioctl.c | 34 ++++++++---- drivers/md/dm-raid1.c | 67 ++++++++++++----------- drivers/md/dm-snap.c | 6 +- drivers/md/dm.c | 101 +++++++++++++++++++++++++----------- drivers/net/sky2.c | 101 +++++++++++++++++++++--------------- drivers/net/sky2.h | 17 +++++- drivers/net/tg3.c | 12 ++-- drivers/net/tg3.h | 1 drivers/net/wireless/spectrum_cs.c | 2 drivers/usb/host/uhci-q.c | 2 fs/binfmt_elf.c | 15 ++--- fs/ext2/super.c | 41 ++++++++++++++ fs/locks.c | 6 +- include/asm-ia64/mman.h | 2 include/asm-ia64/sn/xp.h | 22 ++++++- include/asm-ia64/sn/xpc.h | 4 + include/linux/netfilter_bridge.h | 16 ++++- include/linux/skbuff.h | 15 +++++ kernel/futex.c | 1 kernel/stop_machine.c | 1 lib/ts_bm.c | 11 +-- net/bridge/br_forward.c | 10 ++- net/core/pktgen.c | 4 + net/ipv4/ip_output.c | 4 - net/ipv4/tcp_output.c | 1 net/ipv6/exthdrs.c | 29 +++++----- net/ipv6/ip6_output.c | 2 net/sctp/socket.c | 10 ++- 35 files changed, 437 insertions(+), 228 deletions(-)
Summary of changes from v2.6.17.11 to v2.6.17.12
================================================
Alan Cox:
Missing PCI id update for VIA IDE
Alan Stern:
uhci-hcd: fix list access bug
Alasdair G Kergon:
dm snapshot: unify chunk_size
Chen-Li Tien:
PKTGEN: Fix oops when used with balance-tlb bonding
Christian Borntraeger:
bug in futex unqueue_me
Daniel Kobras:
dm: Fix deadlock under high i/o load in raid1 setup.
David S. Miller:
SPARC64: Fix X server crashes on sparc64
PKTGEN: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too.
Ernie Petrides:
binfmt_elf: fix checks for bad address
Fernando Vazquez:
fix compilation error on IA64
Greg Kroah-Hartman:
Linux 2.6.17.12
Herbert Xu:
Fix output framentation of paged-skbs
Jeff Mahoney:
dm: fix idr minor allocation
dm: move idr_pre_get
dm: change minor_lock to spinlock
dm: add DMF_FREEING
dm: fix mapped device ref counting
dm: add module ref counting
dm: fix block device initialisation
Michael Chan:
TG3: Disable TSO by default
Michael Rash:
TEXTSEARCH: Fix Boyer Moore initialization bug
Neil Brown:
Have ext2 reject file handles with bad inode numbers early.
dm: mirror sector offset fix
Richard Purdie:
spectrum_cs: Fix firmware uploading errors
Robin Holt:
Silent data corruption caused by XPC
Sridhar Samudrala:
SCTP: Fix sctp_primitive_ABORT() call in sctp_close().
Stephen Hemminger:
bridge-netfilter: don't overwrite memory outside of skb Allow per-route window scale limiting
sky2: accept flow control
sky2: clear status IRQ after empty
sky2: use dev_alloc_skb for receive buffers
sky2: MSI test timing
sky2: fix fiber support
sky2: version 1.6.1
Trond Myklebust:
fcntl(F_SETSIG) fix
Yingchao Zhou:
Remove redundant up() in stop_machine()
YOSHIFUJI Hideaki:
IPV6 OOPS'er triggerable by any user
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 17 -EXTRAVERSION = .11 +EXTRAVERSION = .12 NAME=Crazed Snow-Weasel # *DOCUMENTATION*
arch/ia64/sn/kernel/xpc_channel.c +2 -2
@@ -279,8 +279,8 @@ xpc_pull_remote_cachelines(struct xpc_pareturn part->reason; } - bte_ret =xp_bte_copy ((u64 ) src, (u64 )ia64_tpa ((u64 ) dst), - (u64 ) cnt, (BTE_NORMAL |BTE_WACQUIRE ),NULL ); + bte_ret =xp_bte_copy ((u64 ) src, (u64 ) dst, (u64 ) cnt, + (BTE_NORMAL |BTE_WACQUIRE ),NULL );if (bte_ret ==BTE_SUCCESS ) {return xpcSuccess; }
arch/ia64/sn/kernel/xpc_main.c +16 -12
@@ -1052,6 +1052,8 @@ xpc_do_exit(enum xpc_retval reason)if (xpc_sysctl) {unregister_sysctl_table (xpc_sysctl); } + +kfree (xpc_remote_copy_buffer_base); }
@@ -1212,24 +1214,20 @@ xpc_init(void)partid_t partid;struct xpc_partition *part;pid_t pid; +size_t buf_size;if (!ia64_platform_is ("sn2" )) {return -ENODEV ; } -/* -* xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng -* various portions of a partition's reserved page. Its size is based -* on the size of the reserved page header and part_nasids mask. So we -* need to ensure that the other items will fit as well. -*/ -if (XPC_RP_VARS_SIZE >XPC_RP_HEADER_SIZE +XP_NASID_MASK_BYTES ) { -dev_err (xpc_part,"xpc_remote_copy_buffer is not big enough\n" ); -return -EPERM ; - } -DBUG_ON ((u64 ) xpc_remote_copy_buffer != -L1_CACHE_ALIGN ((u64 ) xpc_remote_copy_buffer)); + + buf_size =max (XPC_RP_VARS_SIZE , +XPC_RP_HEADER_SIZE +XP_NASID_MASK_BYTES ); + xpc_remote_copy_buffer =xpc_kmalloc_cacheline_aligned (buf_size, +GFP_KERNEL , &xpc_remote_copy_buffer_base); +if (xpc_remote_copy_buffer ==NULL ) +return -ENOMEM ;snprintf (xpc_part->bus_id,BUS_ID_SIZE ,"part" );snprintf (xpc_chan->bus_id,BUS_ID_SIZE ,"chan" );
@@ -1293,6 +1291,8 @@ xpc_init(void)if (xpc_sysctl) {unregister_sysctl_table (xpc_sysctl); } + +kfree (xpc_remote_copy_buffer_base);return -EBUSY ; }
@@ -1311,6 +1311,8 @@ xpc_init(void)if (xpc_sysctl) {unregister_sysctl_table (xpc_sysctl); } + +kfree (xpc_remote_copy_buffer_base);return -EBUSY ; }
@@ -1362,6 +1364,8 @@ xpc_init(void)if (xpc_sysctl) {unregister_sysctl_table (xpc_sysctl); } + +kfree (xpc_remote_copy_buffer_base);return -EBUSY ; }
arch/ia64/sn/kernel/xpc_partition.c +8 -16
@@ -71,19 +71,15 @@ struct xpc_partition xpc_partitions[XP_M* Generic buffer used to store a local copy of portions of a remote * partition's reserved page (either its header and part_nasids mask, * or its vars). -* -* xpc_discovery runs only once and is a seperate thread that is -* very likely going to be processing in parallel with receiving -* interrupts. */ -char ____cacheline_aligned xpc_remote_copy_buffer[XPC_RP_HEADER_SIZE + -XP_NASID_MASK_BYTES ]; +char *xpc_remote_copy_buffer; +void *xpc_remote_copy_buffer_base;/* * Guarantee that the kmalloc'd memory is cacheline aligned. */ -static void * +void *xpc_kmalloc_cacheline_aligned (size_t size,gfp_t flags,void **base) {/* see if kmalloc will give us cachline aligned memory by default */
@@ -148,7 +144,7 @@ xpc_get_rsvd_page_pa(int nasid) } } - bte_res =xp_bte_copy (rp_pa,ia64_tpa (buf), buf_len, + bte_res =xp_bte_copy (rp_pa, buf, buf_len, (BTE_NOTIFY |BTE_WACQUIRE ),NULL );if (bte_res !=BTE_SUCCESS ) {dev_dbg (xpc_part,"xp_bte_copy failed %i\n" , bte_res);
@@ -447,7 +443,7 @@ xpc_check_remote_hb(void)/* pull the remote_hb cache line */ bres =xp_bte_copy (part->remote_vars_pa, -ia64_tpa ((u64 ) remote_vars), + (u64 ) remote_vars,XPC_RP_VARS_SIZE , (BTE_NOTIFY |BTE_WACQUIRE ),NULL );if (bres !=BTE_SUCCESS ) {
@@ -498,8 +494,7 @@ xpc_get_remote_rp(int nasid, u64 *discov/* pull over the reserved page header and part_nasids mask */ - - bres =xp_bte_copy (*remote_rp_pa,ia64_tpa ((u64 ) remote_rp), + bres =xp_bte_copy (*remote_rp_pa, (u64 ) remote_rp,XPC_RP_HEADER_SIZE + xp_nasid_mask_bytes, (BTE_NOTIFY |BTE_WACQUIRE ),NULL );if (bres !=BTE_SUCCESS ) {
@@ -554,11 +549,8 @@ xpc_get_remote_vars(u64 remote_vars_pa,return xpcVarsNotSet; } -/* pull over the cross partition variables */ - - bres =xp_bte_copy (remote_vars_pa,ia64_tpa ((u64 ) remote_vars), -XPC_RP_VARS_SIZE , + bres =xp_bte_copy (remote_vars_pa, (u64 ) remote_vars,XPC_RP_VARS_SIZE , (BTE_NOTIFY |BTE_WACQUIRE ),NULL );if (bres !=BTE_SUCCESS ) {return xpc_map_bte_errors (bres);
@@ -1239,7 +1231,7 @@ xpc_initiate_partid_to_nasids(partid_t p part_nasid_pa = (u64 )XPC_RP_PART_NASIDS (part->remote_rp_pa); - bte_res =xp_bte_copy (part_nasid_pa,ia64_tpa ((u64 ) nasid_mask), + bte_res =xp_bte_copy (part_nasid_pa, (u64 ) nasid_mask, xp_nasid_mask_bytes, (BTE_NOTIFY |BTE_WACQUIRE ),NULL );return xpc_map_bte_errors (bte_res);
arch/sparc64/mm/generic.c +2 -0
@@ -69,6 +69,8 @@ static inline void io_remap_pte_range(st }else offset +=PAGE_SIZE ; +if (pte_write (entry)) + entry =pte_mkdirty (entry); do { BUG_ON(!pte_none(*pte)); set_pte_at(mm, address, pte, entry);
drivers/ide/pci/via82cxxx.c +2 -1
@@ -6,7 +6,7 @@* * vt82c576, vt82c586, vt82c586a, vt82c586b, vt82c596a, vt82c596b, * vt82c686, vt82c686a, vt82c686b, vt8231, vt8233, vt8233c, vt8233a, -* vt8235, vt8237 +* vt8235, vt8237, vt8237a * * Copyright (c) 2000-2002 Vojtech Pavlik *
@@ -82,6 +82,7 @@ static struct via_isa_bridge { { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, { "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, + { "vt8237a", PCI_DEVICE_ID_VIA_8237A, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, { "vt8233a", PCI_DEVICE_ID_VIA_8233A, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, { "vt8233c", PCI_DEVICE_ID_VIA_8233C_0, 0x00, 0x2f, VIA_UDMA_100 },
drivers/md/dm-exception-store.c +42 -23
138 lines not on this page · raw message
drivers/md/dm-ioctl.c +24 -10
@@ -102,8 +102,10 @@ static struct hash_cell *__get_name_cellunsigned int h =hash_str (str); list_for_each_entry (hc, _name_buckets + h, name_list) -if (!strcmp (hc->name, str)) +if (!strcmp (hc->name, str)) { +dm_get (hc->md);return hc; + }return NULL ; }
@@ -114,8 +116,10 @@ static struct hash_cell *__get_uuid_cellunsigned int h =hash_str (str); list_for_each_entry (hc, _uuid_buckets + h, uuid_list) -if (!strcmp (hc->uuid, str)) +if (!strcmp (hc->uuid, str)) { +dm_get (hc->md);return hc; + }return NULL ; }
@@ -191,7 +195,7 @@ static int unregister_with_devfs(struct*/ static int dm_hash_insert (const char *name,const char *uuid,struct mapped_device *md) { -struct hash_cell *cell; +struct hash_cell *cell, *hc;/* * Allocate the new cells.
@@ -204,14 +208,19 @@ static int dm_hash_insert(const char *na* Insert the cell into both hash tables. */ down_write (&_hash_lock); -if (__get_name_cell (name)) + hc =__get_name_cell (name); +if (hc) { +dm_put (hc->md); goto bad; + }list_add (&cell->name_list, _name_buckets +hash_str (name));if (uuid) { -if (__get_uuid_cell (uuid)) { + hc =__get_uuid_cell (uuid); +if (hc) {list_del (&cell->name_list); +dm_put (hc->md); goto bad; }list_add (&cell->uuid_list, _uuid_buckets +hash_str (uuid));
@@ -289,6 +298,7 @@ static int dm_hash_rename(const char *olif (hc) {DMWARN ("asked to rename to an already existing name %s -> %s" , old, new); +dm_put (hc->md);up_write (&_hash_lock);kfree (new_name);return -EBUSY ;
@@ -328,6 +338,7 @@ static int dm_hash_rename(const char *oldm_table_put (table); } +dm_put (hc->md);up_write (&_hash_lock);kfree (old_name);return 0 ;
@@ -611,10 +622,8 @@ static struct hash_cell *__find_device_hreturn __get_name_cell (param->name); md =dm_get_md (huge_decode_dev (param->dev)); -if (md) { +if (md) mdptr =dm_get_mdptr (md); -dm_put (md); - }return mdptr; }
@@ -628,7 +637,6 @@ static struct mapped_device *find_device hc =__find_device_hash_cell (param);if (hc) { md = hc->md; -dm_get (md);/* * Sneakily write in both the name and the uuid
@@ -653,6 +661,7 @@ static struct mapped_device *find_devicestatic int dev_remove (struct dm_ioctl *param,size_t param_size) {struct hash_cell *hc; +struct mapped_device *md;down_write (&_hash_lock); hc =__find_device_hash_cell (param);
@@ -663,8 +672,11 @@ static int dev_remove(struct dm_ioctl *preturn -ENXIO ; } + md = hc->md; +__hash_remove (hc);up_write (&_hash_lock); +dm_put (md); param->data_size =0 ;return 0 ; }
@@ -790,7 +802,6 @@ static int do_resume(struct dm_ioctl *pa } md = hc->md; -dm_get (md); new_map = hc->new_map; hc->new_map =NULL ;
@@ -1078,6 +1089,7 @@ static int table_clear(struct dm_ioctl * {int r;struct hash_cell *hc; +struct mapped_device *md;down_write (&_hash_lock);
@@ -1096,7 +1108,9 @@ static int table_clear(struct dm_ioctl * param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; r =__dev_status (hc->md, param); + md = hc->md;up_write (&_hash_lock); +dm_put (md);return r; }
drivers/md/dm-raid1.c +35 -32
96 lines not on this page · raw message
drivers/md/dm-snap.c +3 -3
@@ -530,7 +530,7 @@ static int snapshot_ctr(struct dm_target } ti->private = s; - ti->split_io = chunk_size; + ti->split_io = s->chunk_size;return 0 ;
@@ -1204,7 +1204,7 @@ static int origin_status(struct dm_targestatic struct target_type origin_target = { .name ="snapshot-origin" , - .version = {1 ,1 ,0 }, + .version = {1 ,4 ,0 }, .module =THIS_MODULE , .ctr = origin_ctr, .dtr = origin_dtr,
@@ -1215,7 +1215,7 @@ static struct target_type origin_targetstatic struct target_type snapshot_target = { .name ="snapshot" , - .version = {1 ,1 ,0 }, + .version = {1 ,4 ,0 }, .module =THIS_MODULE , .ctr = snapshot_ctr, .dtr = snapshot_dtr,
drivers/md/dm.c +71 -30
226 lines not on this page · raw message
drivers/net/sky2.c +59 -42
228 lines not on this page · raw message
drivers/net/sky2.h +15 -2
@@ -1318,6 +1318,14 @@ enum { };/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */ +/***** PHY_MARV_PHY_CTRL (page 1) 16 bit r/w Fiber Specific Ctrl *****/ +enum { +PHY_M_FIB_FORCE_LNK =1 <<10 ,/* Force Link Good */ +PHY_M_FIB_SIGD_POL =1 <<9 ,/* SIGDET Polarity */ +PHY_M_FIB_TX_DIS =1 <<3 ,/* Transmitter Disable */ +}; + +/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */ /***** PHY_MARV_PHY_CTRL (page 2) 16 bit r/w MAC Specific Ctrl *****/ enum {PHY_M_MAC_MD_MSK =7 <<7 ,/* Bit 9.. 7: Mode Select Mask */
@@ -1566,7 +1574,7 @@ enum {GMR_FS_ANY_ERR =GMR_FS_RX_FF_OV |GMR_FS_CRC_ERR |GMR_FS_FRAGMENT |GMR_FS_LONG_ERR | -GMR_FS_MII_ERR |GMR_FS_BAD_FC |GMR_FS_GOOD_FC | +GMR_FS_MII_ERR |GMR_FS_BAD_FC | GMR_FS_UN_SIZE | GMR_FS_JABBER, };
@@ -1879,7 +1887,7 @@ struct sky2_hw {int pm_cap;u8 chip_id;u8 chip_rev; -u8 copper; +u8 pmd_type;u8 ports;struct sky2_status_le *st_le;
@@ -1891,6 +1899,11 @@ struct sky2_hw {wait_queue_head_t msi_wait; }; +static inline int sky2_is_copper (const struct sky2_hw *hw) +{ +return !(hw->pmd_type =='L' || hw->pmd_type =='S' || hw->pmd_type =='P' ); +} +/* Register accessor for memory mapped device */ static inline u32 sky2_read32 (const struct sky2_hw *hw,unsigned reg) {
drivers/net/tg3.c +8 -4
@@ -69,8 +69,8 @@ #include "tg3.h"#define DRV_MODULE_NAME "tg3"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.59" -#define DRV_MODULE_RELDATE "June 8, 2006" +#define DRV_MODULE_VERSION "3.59.1" +#define DRV_MODULE_RELDATE "August 25, 2006"#define TG3_DEF_MAC_MODE 0#define TG3_DEF_RX_MODE 0
@@ -11381,11 +11381,15 @@ #if TG3_TSO_SUPPORT != 0 tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE; } -/* TSO is on by default on chips that support hardware TSO. +/* TSO is on by default on chips that support HW_TSO_2. +* Some HW_TSO_1 capable chips have bugs that can lead to +* tx timeouts in some cases when TSO is enabled. * Firmware TSO on older chips gives lower performance, so it * is off by default, but can be enabled using ethtool. */ -if (tp->tg3_flags2 &TG3_FLG2_HW_TSO ) +if ((tp->tg3_flags2 &TG3_FLG2_HW_TSO_2 ) || + (GET_ASIC_REV (tp->pci_chip_rev_id) ==ASIC_REV_5750 && + tp->pci_chip_rev_id >=CHIPREV_ID_5750_C2 )) dev->features |=NETIF_F_TSO ;#endif
drivers/net/tg3.h +1 -0
@@ -125,6 +125,7 @@ #define CHIPREV_ID_5705_A3 0x3003#define CHIPREV_ID_5750_A0 0x4000#define CHIPREV_ID_5750_A1 0x4001#define CHIPREV_ID_5750_A3 0x4003 +#define CHIPREV_ID_5750_C2 0x4202#define CHIPREV_ID_5752_A0_HW 0x5000#define CHIPREV_ID_5752_A0 0x6000#define CHIPREV_ID_5752_A1 0x6001
drivers/net/wireless/spectrum_cs.c +1 -1
@@ -245,7 +245,7 @@ spectrum_reset(struct pcmcia_device *linu_int save_cor;/* Doing it if hardware is gone is guaranteed crash */ -if (pcmcia_dev_present (link)) +if (!pcmcia_dev_present (link))return -ENODEV ;/* Save original COR value */
drivers/usb/host/uhci-q.c +1 -1
@@ -264,7 +264,7 @@ static void uhci_fixup_toggles(struct uh* need to change any toggles in this URB */ td = list_entry(urbp->td_list.next, struct uhci_td, list);if (toggle >1 ||uhci_toggle (td_token (td)) == toggle) { - td = list_entry(urbp->td_list.next, struct uhci_td, + td = list_entry(urbp->td_list.prev, struct uhci_td, list); toggle =uhci_toggle (td_token (td)) ^1 ;
fs/binfmt_elf.c +7 -8
@@ -86,7 +86,7 @@ static struct linux_binfmt elf_format = .min_coredump = ELF_EXEC_PAGESIZE }; -#define BAD_ADDR (x) ((unsigned long)(x) > TASK_SIZE) +#define BAD_ADDR (x) ((unsigned long)(x) >= TASK_SIZE)static int set_brk (unsigned long start,unsigned long end) {
@@ -389,7 +389,7 @@ static unsigned long load_elf_interp(str* <= p_memsize so it is only necessary to check p_memsz. */ k = load_addr + eppnt->p_vaddr; -if (k >TASK_SIZE || eppnt->p_filesz > eppnt->p_memsz || +if (BAD_ADDR (k) || eppnt->p_filesz > eppnt->p_memsz || eppnt->p_memsz >TASK_SIZE ||TASK_SIZE - eppnt->p_memsz < k) { error = -ENOMEM ; goto out_close;
@@ -876,7 +876,7 @@ static int load_elf_binary(struct linux_* allowed task size. Note that p_filesz must always be * <= p_memsz so it is only necessary to check p_memsz. */ -if (k >TASK_SIZE || elf_ppnt->p_filesz > elf_ppnt->p_memsz || +if (BAD_ADDR (k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz || elf_ppnt->p_memsz >TASK_SIZE ||TASK_SIZE - elf_ppnt->p_memsz < k) {/* set_brk can never work. Avoid overflows. */
@@ -930,10 +930,9 @@ static int load_elf_binary(struct linux_ interpreter, &interp_load_addr);if (BAD_ADDR (elf_entry)) { -printk (KERN_ERR "Unable to load interpreter %.128s\n" , - elf_interpreter);force_sig (SIGSEGV , current); - retval = -ENOEXEC ;/* Nobody gets to see this, but.. */ + retval =IS_ERR ((void *)elf_entry) ? + (int )elf_entry : -EINVAL ; goto out_free_dentry; } reloc_func_desc = interp_load_addr;
@@ -944,8 +943,8 @@ static int load_elf_binary(struct linux_ }else { elf_entry = loc->elf_ex.e_entry;if (BAD_ADDR (elf_entry)) { -send_sig (SIGSEGV , current,0 ); - retval = -ENOEXEC ;/* Nobody gets to see this, but.. */ +force_sig (SIGSEGV , current); + retval = -EINVAL ; goto out_free_dentry; } }
fs/ext2/super.c +41 -0
53 lines not on this page · raw message
fs/locks.c +4 -2
@@ -1389,8 +1389,9 @@ static int __setlease(struct file *filp,if (!leases_enable) goto out; - error =lease_alloc (filp, arg, &fl); -if (error) + error = -ENOMEM ; + fl =locks_alloc_lock (); +if (fl ==NULL ) goto out;locks_copy_lock (fl, lease);
@@ -1398,6 +1399,7 @@ static int __setlease(struct file *filp,locks_insert_lock (before, fl); *flp = fl; + error =0 ; out:return error; }
include/asm-ia64/mman.h +2 -0
@@ -9,10 +9,12 @@ #define _ASM_IA64_MMAN_H*/ #ifdef __KERNEL__ +#ifndef __ASSEMBLY__#define arch_mmap_check ia64_map_check_rgnint ia64_map_check_rgn (unsigned long addr,unsigned long len,unsigned long flags);#endif +#endif #include <asm-generic/mman.h>
include/asm-ia64/sn/xp.h +18 -4
@@ -60,23 +60,37 @@ #define XP_NASID_MASK_WORDS ((XP_MAX_PHY* the bte_copy() once in the hope that the failure was due to a temporary * aberration (i.e., the link going down temporarily). * -* See bte_copy for definition of the input parameters. +* src - physical address of the source of the transfer. +* vdst - virtual address of the destination of the transfer. +* len - number of bytes to transfer from source to destination. +* mode - see bte_copy() for definition. +* notification - see bte_copy() for definition. * * Note: xp_bte_copy() should never be called while holding a spinlock. */ static inline bte_result_t -xp_bte_copy (u64 src,u64 dest,u64 len,u64 mode,void *notification) +xp_bte_copy (u64 src,u64 vdst,u64 len,u64 mode,void *notification) {bte_result_t ret; +u64 pdst =ia64_tpa (vdst); - ret =bte_copy (src, dest, len, mode, notification); +/* +* Ensure that the physically mapped memory is contiguous. +* +* We do this by ensuring that the memory is from region 7 only. +* If the need should arise to use memory from one of the other +* regions, then modify the BUG_ON() statement to ensure that the +* memory from that region is always physically contiguous. +*/ +BUG_ON (REGION_NUMBER (vdst) !=RGN_KERNEL ); + ret =bte_copy (src, pdst, len, mode, notification);if (ret !=BTE_SUCCESS ) {if (!in_interrupt ()) {cond_resched (); } - ret =bte_copy (src, dest, len, mode, notification); + ret =bte_copy (src, pdst, len, mode, notification); }return ret;
include/asm-ia64/sn/xpc.h +3 -1
@@ -684,7 +684,9 @@ extern struct xpc_vars *xpc_vars;extern struct xpc_rsvd_page *xpc_rsvd_page;extern struct xpc_vars_part *xpc_vars_part;extern struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS +1 ]; -extern char xpc_remote_copy_buffer[]; +extern char *xpc_remote_copy_buffer; +extern void *xpc_remote_copy_buffer_base; +extern void *xpc_kmalloc_cacheline_aligned (size_t ,gfp_t ,void **);extern struct xpc_rsvd_page *xpc_rsvd_page_init (void );extern void xpc_allow_IPI_ops (void );extern void xpc_restrict_IPI_ops (void );
include/linux/netfilter_bridge.h +12 -4
@@ -47,18 +47,26 @@ #define BRNF_DONT_TAKE_PARENT 0x04#define BRNF_BRIDGED 0x08#define BRNF_NF_BRIDGE_PREROUTING 0x10 -/* Only used in br_forward.c */ -static inline -void nf_bridge_maybe_copy_header (struct sk_buff *skb) +static inline int nf_bridge_maybe_copy_header (struct sk_buff *skb) { +int err; +if (skb->nf_bridge) {if (skb->protocol ==__constant_htons (ETH_P_8021Q )) { + err =skb_cow (skb,18 ); +if (err) +return err;memcpy (skb->data -18 , skb->nf_bridge->data,18 );skb_push (skb,4 ); - }else + }else { + err =skb_cow (skb,16 ); +if (err) +return err;memcpy (skb->data -16 , skb->nf_bridge->data,16 ); + } } +return 0 ; }/* This is called by the IP fragmenting code and it ensures there is
include/linux/skbuff.h +15 -0
@@ -1009,6 +1009,21 @@ static inline int pskb_trim(struct sk_bu }/** +* pskb_trim_unique - remove end from a paged unique (not cloned) buffer +* @skb: buffer to alter +* @len: new length +* +* This is identical to pskb_trim except that the caller knows that +* the skb is not cloned so we should never get an error due to out- +* of-memory. +*/ +static inline void pskb_trim_unique (struct sk_buff *skb,unsigned int len) +{ +int err =pskb_trim (skb, len); +BUG_ON (err); +} + +/** * skb_orphan - orphan a buffer * @skb: buffer to orphan *
kernel/futex.c +1 -0
@@ -593,6 +593,7 @@ static int unqueue_me(struct futex_q *q)/* In the common case we don't take the spinlock, which is nice. */ retry: lock_ptr = q->lock_ptr; +barrier ();if (lock_ptr !=0 ) {spin_lock (lock_ptr);/*
kernel/stop_machine.c +0 -1
@@ -111,7 +111,6 @@ static int stop_machine(void)/* If some failed, kill them all. */ if (ret <0 ) {stopmachine_set_state (STOPMACHINE_EXIT ); -up (&stopmachine_mutex);return ret; }
lib/ts_bm.c +5 -6
@@ -112,15 +112,14 @@ static int subpattern(u8 *pattern, int ireturn ret; } -static void compute_prefix_tbl (struct ts_bm *bm,const u8 *pattern, -unsigned int len) +static void compute_prefix_tbl (struct ts_bm *bm) {int i, j, g;for (i =0 ; i <ASIZE ; i++) - bm->bad_shift[i] = len; -for (i =0 ; i < len -1 ; i++) - bm->bad_shift[pattern[i]] = len -1 - i; + bm->bad_shift[i] = bm->patlen; +for (i =0 ; i < bm->patlen -1 ; i++) + bm->bad_shift[bm->pattern[i]] = bm->patlen -1 - i;/* Compute the good shift array, used to match reocurrences * of a subpattern */
@@ -151,8 +150,8 @@ static struct ts_config *bm_init(const v bm =ts_config_priv (conf); bm->patlen = len; bm->pattern = (u8 *) bm->good_shift + prefix_tbl_len; -compute_prefix_tbl (bm, pattern, len);memcpy (bm->pattern, pattern, len); +compute_prefix_tbl (bm);return conf; }
net/bridge/br_forward.c +7 -3
@@ -43,11 +43,15 @@ int br_dev_queue_push_xmit(struct sk_bufelse {#ifdef CONFIG_BRIDGE_NETFILTER /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */ -nf_bridge_maybe_copy_header (skb); +if (nf_bridge_maybe_copy_header (skb)) +kfree_skb (skb); + else#endif -skb_push (skb,ETH_HLEN ); + { +skb_push (skb,ETH_HLEN ); -dev_queue_xmit (skb); +dev_queue_xmit (skb); + } }return 0 ;
net/core/pktgen.c +4 -0
@@ -2149,6 +2149,8 @@ static struct sk_buff *fill_packet_ipv4( skb->mac.raw = ((u8 *) iph) -14 - pkt_dev->nr_labels*sizeof (u32); skb->dev = odev; skb->pkt_type =PACKET_HOST ; + skb->nh.iph = iph; + skb->h.uh = udph;if (pkt_dev->nfrags <=0 ) pgh = (struct pktgen_hdr *)skb_put (skb, datalen);
@@ -2460,6 +2462,8 @@ static struct sk_buff *fill_packet_ipv6( skb->protocol = protocol; skb->dev = odev; skb->pkt_type =PACKET_HOST ; + skb->nh.ipv6h = iph; + skb->h.uh = udph;if (pkt_dev->nfrags <=0 ) pgh = (struct pktgen_hdr *)skb_put (skb, datalen);
net/ipv4/ip_output.c +2 -2
@@ -946,7 +946,7 @@ alloc_new_skb: skb_prev->csum =csum_sub (skb_prev->csum, skb->csum); data += fraggap; -skb_trim (skb_prev, maxfraglen); +pskb_trim_unique (skb_prev, maxfraglen); } copy = datalen - transhdrlen - fraggap;
@@ -1139,7 +1139,7 @@ ssize_t ip_append_page(struct sock *sk, data, fraggap, 0); skb_prev->csum =csum_sub (skb_prev->csum, skb->csum); -skb_trim (skb_prev, maxfraglen); +pskb_trim_unique (skb_prev, maxfraglen); }/*
net/ipv4/tcp_output.c +1 -0
@@ -197,6 +197,7 @@ void tcp_select_initial_window(int __spa* See RFC1323 for an explanation of the limit to 14 */ space =max_t (u32, sysctl_tcp_rmem[2 ], sysctl_rmem_max); + space =min_t (u32, space, *window_clamp);while (space >65535 && (*rcv_wscale) <14 ) { space >>=1 ; (*rcv_wscale)++;
net/ipv6/exthdrs.c +16 -13
@@ -635,14 +635,17 @@ ipv6_renew_options(struct sock *sk, strustruct ipv6_txoptions *opt2;int err; -if (newtype !=IPV6_HOPOPTS && opt->hopopt) - tot_len +=CMSG_ALIGN (ipv6_optlen (opt->hopopt)); -if (newtype !=IPV6_RTHDRDSTOPTS && opt->dst0opt) - tot_len +=CMSG_ALIGN (ipv6_optlen (opt->dst0opt)); -if (newtype !=IPV6_RTHDR && opt->srcrt) - tot_len +=CMSG_ALIGN (ipv6_optlen (opt->srcrt)); -if (newtype !=IPV6_DSTOPTS && opt->dst1opt) - tot_len +=CMSG_ALIGN (ipv6_optlen (opt->dst1opt)); +if (opt) { +if (newtype !=IPV6_HOPOPTS && opt->hopopt) + tot_len +=CMSG_ALIGN (ipv6_optlen (opt->hopopt)); +if (newtype !=IPV6_RTHDRDSTOPTS && opt->dst0opt) + tot_len +=CMSG_ALIGN (ipv6_optlen (opt->dst0opt)); +if (newtype !=IPV6_RTHDR && opt->srcrt) + tot_len +=CMSG_ALIGN (ipv6_optlen (opt->srcrt)); +if (newtype !=IPV6_DSTOPTS && opt->dst1opt) + tot_len +=CMSG_ALIGN (ipv6_optlen (opt->dst1opt)); + } +if (newopt && newoptlen) tot_len +=CMSG_ALIGN (newoptlen);
@@ -659,25 +662,25 @@ ipv6_renew_options(struct sock *sk, stru opt2->tot_len = tot_len; p = (char *)(opt2 +1 ); - err =ipv6_renew_option (opt->hopopt, newopt, newoptlen, + err =ipv6_renew_option (opt ? opt->hopopt :NULL , newopt, newoptlen, newtype !=IPV6_HOPOPTS , &opt2->hopopt, &p);if (err) goto out; - err =ipv6_renew_option (opt->dst0opt, newopt, newoptlen, + err =ipv6_renew_option (opt ? opt->dst0opt :NULL , newopt, newoptlen, newtype !=IPV6_RTHDRDSTOPTS , &opt2->dst0opt, &p);if (err) goto out; - err =ipv6_renew_option (opt->srcrt, newopt, newoptlen, + err =ipv6_renew_option (opt ? opt->srcrt :NULL , newopt, newoptlen, newtype !=IPV6_RTHDR , - (struct ipv6_opt_hdr **)opt2->srcrt, &p); + (struct ipv6_opt_hdr **)&opt2->srcrt, &p);if (err) goto out; - err =ipv6_renew_option (opt->dst1opt, newopt, newoptlen, + err =ipv6_renew_option (opt ? opt->dst1opt :NULL , newopt, newoptlen, newtype !=IPV6_DSTOPTS , &opt2->dst1opt, &p);if (err)
net/ipv6/ip6_output.c +1 -1
@@ -1047,7 +1047,7 @@ alloc_new_skb: skb_prev->csum =csum_sub (skb_prev->csum, skb->csum); data += fraggap; -skb_trim (skb_prev, maxfraglen); +pskb_trim_unique (skb_prev, maxfraglen); } copy = datalen - transhdrlen - fraggap;if (copy <0 ) {
net/sctp/socket.c +7 -3
@@ -1246,9 +1246,13 @@ SCTP_STATIC void sctp_close(struct sock } } -if (sock_flag (sk,SOCK_LINGER ) && !sk->sk_lingertime) -sctp_primitive_ABORT (asoc,NULL ); -else +if (sock_flag (sk,SOCK_LINGER ) && !sk->sk_lingertime) { +struct sctp_chunk *chunk; + + chunk =sctp_make_abort_user (asoc,NULL ,0 ); +if (chunk) +sctp_primitive_ABORT (asoc, chunk); + }else sctp_primitive_SHUTDOWN (asoc,NULL ); }
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
I get this compile error:
CC drivers/ide/pci/via82cxxx.odrivers/ide/pci/via82cxxx.c:85: error: PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function) drivers/ide/pci/via82cxxx.c:85: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:85: error: (near initialization for via_isa_bridges[3].id') drivers/ide/pci/via82cxxx.c:85: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:85: error: (near initialization for via_isa_bridges[3]') drivers/ide/pci/via82cxxx.c:86: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:86: error: (near initialization for via_isa_bridges[4]') drivers/ide/pci/via82cxxx.c:87: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:87: error: (near initialization for via_isa_bridges[5]') drivers/ide/pci/via82cxxx.c:88: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:88: error: (near initialization for via_isa_bridges[6]') drivers/ide/pci/via82cxxx.c:89: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:89: error: (near initialization for via_isa_bridges[7]') drivers/ide/pci/via82cxxx.c:90: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:90: error: (near initialization for via_isa_bridges[8]') drivers/ide/pci/via82cxxx.c:91: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:91: error: (near initialization for via_isa_bridges[9]') drivers/ide/pci/via82cxxx.c:92: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:92: error: (near initialization for via_isa_bridges[10]') drivers/ide/pci/via82cxxx.c:93: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:93: error: (near initialization for via_isa_bridges[11]') drivers/ide/pci/via82cxxx.c:94: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:94: error: (near initialization for via_isa_bridges[12]') drivers/ide/pci/via82cxxx.c:95: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:95: error: (near initialization for via_isa_bridges[13]') drivers/ide/pci/via82cxxx.c:96: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:96: error: (near initialization for via_isa_bridges[14]') drivers/ide/pci/via82cxxx.c:97: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:97: error: (near initialization for via_isa_bridges[15]') drivers/ide/pci/via82cxxx.c:98: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:98: error: (near initialization for via_isa_bridges[16]') drivers/ide/pci/via82cxxx.c:99: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:99: error: (near initialization for via_isa_bridges[17]') drivers/ide/pci/via82cxxx.c:100: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:100: error: (near initialization for via_isa_bridges[18]') drivers/ide/pci/via82cxxx.c:101: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:101: error: (near initialization for via_isa_bridges[19]') drivers/ide/pci/via82cxxx.c:102: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:102: error: (near initialization for via_isa_bridges[20]') drivers/ide/pci/via82cxxx.c:103: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:103: error: (near initialization for `via_isa_bridges[21]') make[3]: *** [drivers/ide/pci/via82cxxx.o] Error 1
make[2]: *** [drivers/ide/pci] Error 2
make[1]: *** [drivers/ide] Error 2
make: *** [drivers] Error 2
Tried twice, 5 of 6 targets okay, 1 of 6 not so good.
Grant.
Quoted 53 lines · Grant Coady
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
I get this compile error:
CC
drivers/ide/pci/via82cxxx.odrivers/ide/pci/via82cxxx.c:85: error:PCI_DEVICE_ID_VIA_8237A' undeclared here (not in a function) drivers/ide/pci/via82cxxx.c:85: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:85: error: (near initialization forvia_isa_bridges[3].id')drivers/ide/pci/via82cxxx.c:85: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:85: error: (near initialization forvia_isa_bridges[3]') drivers/ide/pci/via82cxxx.c:86: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:86: error: (near initialization forvia_isa_bridges[4]')drivers/ide/pci/via82cxxx.c:87: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:87: error: (near initialization forvia_isa_bridges[5]') drivers/ide/pci/via82cxxx.c:88: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:88: error: (near initialization forvia_isa_bridges[6]')drivers/ide/pci/via82cxxx.c:89: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:89: error: (near initialization forvia_isa_bridges[7]') drivers/ide/pci/via82cxxx.c:90: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:90: error: (near initialization forvia_isa_bridges[8]')drivers/ide/pci/via82cxxx.c:91: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:91: error: (near initialization forvia_isa_bridges[9]') drivers/ide/pci/via82cxxx.c:92: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:92: error: (near initialization forvia_isa_bridges[10]')drivers/ide/pci/via82cxxx.c:93: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:93: error: (near initialization forvia_isa_bridges[11]') drivers/ide/pci/via82cxxx.c:94: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:94: error: (near initialization forvia_isa_bridges[12]')drivers/ide/pci/via82cxxx.c:95: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:95: error: (near initialization forvia_isa_bridges[13]') drivers/ide/pci/via82cxxx.c:96: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:96: error: (near initialization forvia_isa_bridges[14]')drivers/ide/pci/via82cxxx.c:97: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:97: error: (near initialization forvia_isa_bridges[15]') drivers/ide/pci/via82cxxx.c:98: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:98: error: (near initialization forvia_isa_bridges[16]')drivers/ide/pci/via82cxxx.c:99: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:99: error: (near initialization forvia_isa_bridges[17]') drivers/ide/pci/via82cxxx.c:100: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:100: error: (near initialization forvia_isa_bridges[18]')drivers/ide/pci/via82cxxx.c:101: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:101: error: (near initialization forvia_isa_bridges[19]') drivers/ide/pci/via82cxxx.c:102: error: initializer element is not constant drivers/ide/pci/via82cxxx.c:102: error: (near initialization forvia_isa_bridges[20]')drivers/ide/pci/via82cxxx.c:103: error: initializer element is not constantdrivers/ide/pci/via82cxxx.c:103: error: (near initialization for `via_isa_bridges[21]') make[3]: *** [drivers/ide/pci/via82cxxx.o] Error 1
make[2]: *** [drivers/ide/pci] Error 2
make[1]: *** [drivers/ide] Error 2
make: *** [drivers] Error 2
Quoted 3 lines
Tried twice, 5 of 6 targets okay, 1 of 6 not so good.
Grant.
Same here. Unfortunately I am away from that machine and don't have the .config here. I can get it later if needed.
Thanks,
Scott.
Signature · 2 lines
"Computer Science is no more about computers than astronomy is about telescopes." - Edsger Dijkstra
Quoted 2 lines · Scott J. Harmon
Same here. Unfortunately I am away from that machine and don't have the .config here. I can get it later if needed.
See: "Fwd: [-stable patch] pci_ids.h: add some VIA IDE identifiers" thread for the missing patch <http://lkml.org/lkml/2006/9/8/290>.
Grant.
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
A quick report, will investigate later:
WARNING: /lib/modules/2.6.17.12/kernel/drivers/md/dm-mod.ko needs unknown symbol idr_replace
I did not change my config throughout the series.
Signature · 2 lines
Eyal Lebedinsky ([email protected]) <http://samba.org/eyal/> attach .zip as .dat
Quoted 8 lines · Eyal Lebedinsky
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
A quick report, will investigate later:
WARNING:
/lib/modules/2.6.17.12/kernel/drivers/md/dm-mod.koneeds unknown symbolidr_replaceI did not change my config throughout the series.
Can you send me your .config?
thanks,
greg k-h
Quoted 8 lines · Eyal Lebedinsky
Quoted 1 line · Greg KH
We (the -stable team) are announcing the release of the 2.6.17.12 kernel.
A quick report, will investigate later:
WARNING:
/lib/modules/2.6.17.12/kernel/drivers/md/dm-mod.koneeds unknown symbolidr_replaceI did not change my config throughout the series.
Oh nevermind, I need another patch from Jeff that adds idr_replace(), sorry about that, I'll go dig it up from the proper git tree...
thanks,
greg k-h