Linux 2.6.25.17
Subsystems (15)
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.25 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
I'll also be replying to this message with a copy of the patch between 2.6.25.16 and 2.6.25.17
The updated 2.6.25.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.25.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.25.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/x86/kernel/cpu/mtrr/generic.c | 15 +++++ crypto/authenc.c | 10 ++- drivers/net/forcedeth.c | 4 - drivers/net/r8169.c | 2 drivers/usb/class/cdc-acm.c | 2 drivers/video/fb_defio.c | 19 +++++++ drivers/video/fbmem.c | 4 + fs/cifs/file.c | 4 + fs/cramfs/inode.c | 84 ++++++++++++++------------------ fs/nfsd/nfs4acl.c | 2 include/linux/fb.h | 3 + mm/page_alloc.c | 7 ++ net/sched/sch_prio.c | 16 ++++-- net/sctp/auth.c | 7 ++ net/sctp/endpointola.c | 4 - net/sctp/socket.c | 96 ++++++++++++++++++++++++++++--------- net/sunrpc/sysctl.c | 18 +----- 18 files changed, 198 insertions(+), 101 deletions(-)
Adam Litke (1):
mm: make setup_zone_migrate_reserve() aware of overlapping nodes
Al Viro (1):
cramfs: fix named-pipe handling
Alexey Dobriyan (1):
USB: cdc-acm: don't unlock acm->mutex on error path
Ayaz Abdulla (1):
forcedeth: fix checksum flag
Cyrill Gorcunov (1):
sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
Francois Romieu (1):
r8169: balance pci_map / pci_unmap pair
Greg Kroah-Hartman (1):
Linux 2.6.25.17
Herbert Xu (1):
crypto: authenc - Avoid using clobbered request pointer
Ian Campbell (1):
fbdefio: add set_page_dirty handler to deferred IO FB
J. Bruce Fields (1):
nfsd: fix buffer overrun decoding NFSv4 acl
Jeff Layton (1):
cifs: fix O_APPEND on directio mounts
Thomas Graf (1):
sch_prio: Fix nla_parse_nested_compat() regression
Vlad Yasevich (4):
sctp: fix potential panics in the SCTP-AUTH API.
sctp: add verification checks to SCTP_AUTH_KEY option
sctp: correct bounds check in sctp_setsockopt_auth_key
sctp: fix random memory dereference with SCTP_HMAC_IDENT option.
Yinghai Lu (1):
x86: work around MTRR mask setting
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .16 +EXTRAVERSION = .17 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION*
arch/x86/kernel/cpu/mtrr/generic.c +13 -2
@@ -229,6 +229,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, unsigned long *size, mtrr_type *type) { unsigned int mask_lo, mask_hi, base_lo, base_hi; +unsigned int tmp, hi;rdmsr (MTRRphysMask_MSR (reg), mask_lo, mask_hi);if ((mask_lo &0x800 ) ==0 ) {
@@ -242,8 +243,18 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,rdmsr (MTRRphysBase_MSR (reg), base_lo, base_hi);/* Work out the shifted address mask. */ - mask_lo = size_or_mask | mask_hi << (32 -PAGE_SHIFT ) - | mask_lo >>PAGE_SHIFT ; + tmp = mask_hi << (32 -PAGE_SHIFT ) | mask_lo >>PAGE_SHIFT ; + mask_lo = size_or_mask | tmp; +/* Expand tmp with high bits to all 1s*/ + hi =fls (tmp); +if (hi >0 ) { + tmp |= ~((1 <<(hi -1 )) -1 ); + +if (tmp != mask_lo) { +WARN_ON ("mtrr: your BIOS has set up an incorrect mask, fixing it up.\n" ); + mask_lo = tmp; + } + }/* This works correctly if size is a power of two, i.e. a contiguous range. */
crypto/authenc.c +6 -4
@@ -174,8 +174,9 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,static void crypto_authenc_encrypt_done (struct crypto_async_request *req,int err) { +struct aead_request *areq = req->data; +if (!err) { -struct aead_request *areq = req->data;struct crypto_aead *authenc =crypto_aead_reqtfm (areq);struct crypto_authenc_ctx *ctx =crypto_aead_ctx (authenc);struct ablkcipher_request *abreq =aead_request_ctx (areq);
@@ -185,7 +186,7 @@ static void crypto_authenc_encrypt_done(struct crypto_async_request *req, err =crypto_authenc_genicv (areq, iv,0 ); } -aead_request_complete (req->data, err); +aead_request_complete (areq, err); }static int crypto_authenc_encrypt (struct aead_request *req)
@@ -216,14 +217,15 @@ static int crypto_authenc_encrypt(struct aead_request *req)static void crypto_authenc_givencrypt_done (struct crypto_async_request *req,int err) { +struct aead_request *areq = req->data; +if (!err) { -struct aead_request *areq = req->data;struct skcipher_givcrypt_request *greq =aead_request_ctx (areq); err =crypto_authenc_genicv (areq, greq->giv,0 ); } -aead_request_complete (req->data, err); +aead_request_complete (areq, err); }static int crypto_authenc_givencrypt (struct aead_givcrypt_request *req)
drivers/net/forcedeth.c +2 -2
@@ -5249,7 +5249,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_iif (id->driver_data &DEV_HAS_CHECKSUM ) { np->rx_csum =1 ; np->txrxctl_bits |=NVREG_TXRXCTL_RXCHECK ; - dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG ; + dev->features |=NETIF_F_IP_CSUM |NETIF_F_SG ; dev->features |=NETIF_F_TSO ; }
@@ -5548,7 +5548,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", dev->features & NETIF_F_HIGHDMA ? "highdma " : "", - dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ? + dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ? "csum " : "", dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? "vlan " : "",
drivers/net/r8169.c +1 -1
@@ -2822,7 +2822,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, pkt_size, PCI_DMA_FROMDEVICE);rtl8169_mark_to_asic (desc, tp->rx_buf_sz); }else { -pci_unmap_single (pdev, addr, pkt_size, +pci_unmap_single (pdev, addr, tp->rx_buf_sz,PCI_DMA_FROMDEVICE ); tp->Rx_skbuff[entry] =NULL ; }
drivers/usb/class/cdc-acm.c +1 -1
@@ -531,8 +531,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)tasklet_schedule (&acm->urb_task); done: -err_out:mutex_unlock (&acm->mutex); +err_out:mutex_unlock (&open_mutex);return rv;
drivers/video/fb_defio.c +19 -0
@@ -114,6 +114,17 @@ static struct vm_operations_struct fb_deferred_io_vm_ops = { .page_mkwrite = fb_deferred_io_mkwrite, }; +static int fb_deferred_io_set_page_dirty (struct page *page) +{ +if (!PageDirty (page)) +SetPageDirty (page); +return 0 ; +} + +static const struct address_space_operations fb_deferred_io_aops = { + .set_page_dirty = fb_deferred_io_set_page_dirty, +}; +static int fb_deferred_io_mmap (struct fb_info *info,struct vm_area_struct *vma) { vma->vm_ops = &fb_deferred_io_vm_ops;
@@ -163,6 +174,14 @@ void fb_deferred_io_init(struct fb_info *info) }EXPORT_SYMBOL_GPL (fb_deferred_io_init); +void fb_deferred_io_open (struct fb_info *info, +struct inode *inode, +struct file *file) +{ + file->f_mapping->a_ops = &fb_deferred_io_aops; +} +EXPORT_SYMBOL_GPL (fb_deferred_io_open); +void fb_deferred_io_cleanup (struct fb_info *info) {void *screen_base = (void __force *) info->screen_base;
drivers/video/fbmem.c +4 -0
@@ -1315,6 +1315,10 @@ fb_open(struct inode *inode, struct file *file)if (res)module_put (info->fbops->owner); } +#ifdef CONFIG_FB_DEFERRED_IO +if (info->fbdefio) +fb_deferred_io_open (info, inode, file); +#endif return res; }
fs/cifs/file.c +4 -0
@@ -835,6 +835,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data,return -EBADF ; open_file = (struct cifsFileInfo *) file->private_data; + rc =generic_write_checks (file, poffset, &write_size,0 ); +if (rc) +return rc; + xid =GetXid ();if (*poffset > file->f_path.dentry->d_inode->i_size)
fs/cramfs/inode.c +38 -46
114 lines not on this page · raw message
fs/nfsd/nfs4acl.c +1 -1
@@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt)* enough space for either: */ alloc =sizeof (struct posix_ace_state_array ) - + cnt*sizeof (struct posix_ace_state ); + + cnt*sizeof (struct posix_user_ace_state ); state->users =kzalloc (alloc,GFP_KERNEL );if (!state->users)return -ENOMEM ;
include/linux/fb.h +3 -0
@@ -966,6 +966,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,/* drivers/video/fb_defio.c */ extern void fb_deferred_io_init (struct fb_info *info); +extern void fb_deferred_io_open (struct fb_info *info, +struct inode *inode, +struct file *file);extern void fb_deferred_io_cleanup (struct fb_info *info);extern int fb_deferred_io_fsync (struct file *file,struct dentry *dentry,int datasync);
mm/page_alloc.c +7 -0
@@ -717,6 +717,9 @@ int move_freepages(struct zone *zone,#endif for (page = start_page; page <= end_page;) { +/* Make sure we are not inadvertently changing nodes */ +VM_BUG_ON (page_to_nid (page) !=zone_to_nid (zone)); +if (!pfn_valid_within (page_to_pfn (page))) { page++;continue ;
@@ -2476,6 +2479,10 @@ static void setup_zone_migrate_reserve(struct zone *zone)continue ; page =pfn_to_page (pfn); +/* Watch out for overlapping nodes */ +if (page_to_nid (page) !=zone_to_nid (zone)) +continue ; +/* Blocks with reserved pages will never free, skip them. */ if (PageReserved (page))continue ;
net/sched/sch_prio.c +11 -5
@@ -228,14 +228,20 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt) {struct prio_sched_data *q =qdisc_priv (sch);struct tc_prio_qopt *qopt; -struct nlattr *tb[TCA_PRIO_MAX +1 ]; +struct nlattr *tb[TCA_PRIO_MAX +1 ] = {0 };int err;int i; - err =nla_parse_nested_compat (tb,TCA_PRIO_MAX , opt,NULL , qopt, -sizeof (*qopt)); -if (err <0 ) -return err; + qopt =nla_data (opt); +if (nla_len (opt) <sizeof (*qopt)) +return -1 ; + +if (nla_len (opt) >=sizeof (*qopt) +sizeof (struct nlattr )) { + err =nla_parse_nested (tb,TCA_PRIO_MAX , + (struct nlattr *) (qopt +1 ),NULL ); +if (err <0 ) +return err; + } q->bands = qopt->bands;/* If we're multiqueue, make sure the number of incoming bands
net/sctp/auth.c +7 -0
@@ -80,6 +80,10 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp) {struct sctp_auth_bytes *key; +/* Verify that we are not going to overflow INT_MAX */ +if ((INT_MAX - key_len) <sizeof (struct sctp_auth_bytes )) +return NULL ; +/* Allocate the shared key */ key =kmalloc (sizeof (struct sctp_auth_bytes ) + key_len, gfp);if (!key)
@@ -782,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,for (i =0 ; i < hmacs->shmac_num_idents; i++) { id = hmacs->shmac_idents[i]; +if (id >SCTP_AUTH_HMAC_ID_MAX ) +return -EOPNOTSUPP ; +if (SCTP_AUTH_HMAC_ID_SHA1 == id) has_sha1 =1 ;
net/sctp/endpointola.c +2 -2
@@ -103,6 +103,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,/* Initialize the CHUNKS parameter */ auth_chunks->param_hdr.type =SCTP_PARAM_CHUNKS ; + auth_chunks->param_hdr.length =htons (sizeof (sctp_paramhdr_t));/* If the Add-IP functionality is enabled, we must * authenticate, ASCONF and ASCONF-ACK chunks
@@ -110,8 +111,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,if (sctp_addip_enable) { auth_chunks->chunks[0 ] =SCTP_CID_ASCONF ; auth_chunks->chunks[1 ] =SCTP_CID_ASCONF_ACK ; - auth_chunks->param_hdr.length = -htons (sizeof (sctp_paramhdr_t) +2 ); + auth_chunks->param_hdr.length +=htons (2 ); } }
net/sctp/socket.c +74 -22
214 lines not on this page · raw message
net/sunrpc/sysctl.c +4 -14
@@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file, void __user *buffer, size_t *lenp, loff_t *ppos) { char tmpbuf[256]; -int len; +size_t len; +if ((*ppos && !write) || !*lenp) { *lenp =0 ;return 0 ; } -if (write) -return -EINVAL ; -else { - len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); -if (!access_ok (VERIFY_WRITE , buffer, len)) -return -EFAULT ; - -if (__copy_to_user (buffer, tmpbuf, len)) -return -EFAULT ; - } - *lenp -= len; - *ppos += len; -return 0 ; + len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); +return simple_read_from_buffer (buffer, *lenp, ppos, tmpbuf, len); } static int
Quoted 2 lines · Greg KH
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
[SNIPPED...]
I have a dual AMD Dell that I installed 2.6.25.17 into. It produces severe FS corruption on a Serial ATA drive if I build a kernel on it. I can build the kernel on one of my SCSI drives with no problems.
If I remove one of the CPUs, there is no file-system corruption so I fear that there is some lock missing somewhere in the serial ATA driver code (ata_piix or sata_sil).
If anybody has anything to test with my setup, I can readily test both with and without the two CPUs.
Cheers,
Dick Johnson
Penguin : Linux version 2.6.25.17 on an i686 machine (4786.48 BogoMips). My book : http://www.AbominableFirebug.com/
_
****************************************************************
The information transmitted in this message is confidential and may be privileged. Any review, retransmission, dissemination, or other use of this information by persons or entities other than the intended recipient is prohibited. If you are not the intended recipient, please notify Analogic Corporation immediately - by replying to this message or by sending an email to [email protected] - and destroy all copies of this information, including any attachments, without reading or disclosing them.
Thank you.
Quoted 3 lines
If I remove one of the CPUs, there is no file-system corruption so I fear that there is some lock missing somewhere in the serial ATA driver code (
ata_piixorsata_sil).
All the logic and locking is in the core code so would show up on all sorts of boxes. You say you are using sata_sil - is this on an Nvidia board ?
Quoted 2 lines
If anybody has anything to test with my setup, I can readily test both with and without the two CPUs.
Can you duplicate this with the drives just on the ata_piix ?
Alan
Quoted 8 lines · Alan Cox
Quoted 3 lines
If I remove one of the CPUs, there is no file-system corruption so I fear that there is some lock missing somewhere in the serial ATA driver code (
ata_piixorsata_sil).All the logic and locking is in the core code so would show up on all sorts of boxes. You say you are using
sata_sil- is this on an Nvidia board ?
Quoted 7 lines
Quoted 2 lines
If anybody has anything to test with my setup, I can readily test both with and without the two CPUs.
Can you duplicate this with the drives just on the
ata_piix?Alan
The drives are on the ata_piix. I have no clue why the 'install' added the sata_sil driver because I have never used on on this machine! I note thet /etc/modprobe.conf has an alias for it so at one time a Fedora install thought it found one!
Cheers,
Dick Johnson
Penguin : Linux version 2.6.25.17 on an i686 machine (4786.48 BogoMips). My book : http://www.AbominableFirebug.com/
_
****************************************************************
The information transmitted in this message is confidential and may be privileged. Any review, retransmission, dissemination, or other use of this information by persons or entities other than the intended recipient is prohibited. If you are not the intended recipient, please notify Analogic Corporation immediately - by replying to this message or by sending an email to [email protected] - and destroy all copies of this information, including any attachments, without reading or disclosing them.
Thank you.
Quoted 11 lines · linux-os (Dick Johnson)
Quoted 2 lines · Greg KH
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
[SNIPPED...]
I have a dual AMD Dell that I installed 2.6.25.17 into. It produces severe FS corruption on a Serial ATA drive if I build a kernel on it. I can build the kernel on one of my SCSI drives with no problems.
Is this something new with 2.6.25.17, or has it always been the same for all 2.6.25 kernels?
thanks,
greg k-h
Quoted 13 lines · Greg KH
Quoted 11 lines · linux-os (Dick Johnson)
Quoted 2 lines · Greg KH
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
[SNIPPED...]
I have a dual AMD Dell that I installed 2.6.25.17 into. It produces severe FS corruption on a Serial ATA drive if I build a kernel on it. I can build the kernel on one of my SCSI drives with no problems.
Quoted 7 lines
Is this something new with 2.6.25.17, or has it always been the same for all 2.6.25 kernels?
thanks,
greg k-h
The previous kernel I used was linux-2.6.22.1 and this kernel doesn't have the problem. I discovered the problem when I built and installed the "latest stable" 2.6.25.17. My main working disk, a new SATA, showed severe errors during each reboot. I can duplicate this at will and remove the errors by removing my second CPU!
Cheers,
Dick Johnson
Penguin : Linux version 2.6.25.17 on an i686 machine (4786.48 BogoMips). My book : http://www.AbominableFirebug.com/
_
****************************************************************
The information transmitted in this message is confidential and may be privileged. Any review, retransmission, dissemination, or other use of this information by persons or entities other than the intended recipient is prohibited. If you are not the intended recipient, please notify Analogic Corporation immediately - by replying to this message or by sending an email to [email protected] - and destroy all copies of this information, including any attachments, without reading or disclosing them.
Thank you.
Hi;
08 Eyl 2008 Pts tarihinde, Greg KH şunları yazmıştı:
Quoted 6 lines
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.25 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
[...]
Quoted 2 lines
Yinghai Lu (1):
x86: work around MTRR mask setting
That particular patch causes _lots_ of WARN_ON messages on one of our servers and following commit in Linus's tree solved that problem. If -stable team will release another .25 update maybe following patch can be considered to solve that sitation introduced with 2.6.2.5.17
commit 9754a5b840a209bc1f192d59f63e81b698a55ac8
Author: Ingo Molnar <[email protected]> Date: Fri Aug 22 08:22:23 2008 +0200
x86: work around MTRR mask setting, v2
improve the debug printout:
- make it actually display something
- print it only once
would be nice to have a WARN_ONCE() facility, to feed such things to kerneloops.org.
Cheers
Signature · 4 lines
S.Çağlar Onur <[email protected]> http://cekirdek.pardus.org.tr/~caglar/ Linux is like living in a teepee. No Windows, no Gates and an Apache in house!
Quoted 9 lines · S.Çağlar Onur
Hi;
08 Eyl 2008 Pts tarihinde, Greg KH şunları yazmıştı:
Quoted 6 lines
We (the -stable team) are announcing the release of the 2.6.25.17 kernel.
It contains lots of bugfixes, all over the map. Any users of the 2.6.25 kernel series should upgrade to this version. For details on the fixes, see the changelog entries and the diffstat below.
Quoted 8 lines
[...]
Quoted 2 lines
Yinghai Lu (1):
x86: work around MTRR mask settingThat particular patch causes _lots_ of
WARN_ONmessages on one of our servers and following commit in Linus's tree solved that problem. If -stable team will release another .25 update maybe following patch can be considered to solve that sitation introduced with 2.6.2.5.17commit
9754a5b840a209bc1f192d59f63e81b698a55ac8
Now queued up, thanks for letting us know.
greg k-h