Linux 2.6.15.7
Subsystems (11)
We (the -stable team) are announcing the release of the 2.6.15.7 kernel.
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.15.6 and 2.6.15.7, as it is small enough to do so.
The updated 2.6.15.y git tree can be found at:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.15.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 - drivers/infiniband/ulp/srp/ib_srp.c | 6 +++ drivers/media/video/Kconfig | 1 fs/compat_ioctl.c | 2 - fs/cramfs/inode.c | 60 +++++++++++++++++------------------- fs/ext2/dir.c | 28 +++++++--------- net/core/sock.c | 5 +-- net/ipv4/ip_output.c | 6 --- net/ipv4/netfilter/ip_queue.c | 2 - net/ipv6/netfilter/ip6_queue.c | 2 - 10 files changed, 56 insertions(+), 58 deletions(-)
Summary of changes from v2.6.15.6 to v2.6.15.7
==============================================
Al Viro:
Fix ext2 readdir f_pos re-validation logic
Alexey Kuznetsov:
TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242)
Dave Johnson:
cramfs mounts provide corrupted content since 2.6.15
David S. Miller:
Netfilter ip_queue: Fix wrong skb->len == nlmsg_len assumption
NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
Greg Kroah-Hartman:
Linux 2.6.15.7
Michael Krufky:
Kconfig: VIDEO_DECODER must select FW_LOADER
Randy Dunlap:
compat ifconf: fix limits
Roland Dreier:
IB/srp: Don't send task management commands after target removal
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 15 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME=Sliding Snow Leopard # *DOCUMENTATION*
drivers/infiniband/ulp/srp/ib_srp.c +6 -0
@@ -1154,6 +1154,12 @@ static int srp_send_tsk_mgmt(struct scsispin_lock_irq (target->scsi_host->host_lock); +if (target->state ==SRP_TARGET_DEAD || + target->state ==SRP_TARGET_REMOVED ) { + scmnd->result =DID_BAD_TARGET <<16 ; + goto out; + } +if (scmnd->host_scribble == (void *)-1L ) goto out;
drivers/media/video/Kconfig +1 -0
@@ -340,6 +340,7 @@ config VIDEO_AUDIO_DECODER config VIDEO_DECODER tristate "Add support for additional video chipsets" depends on VIDEO_DEV && I2C && EXPERIMENTAL + select FW_LOADER ---help--- Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 video decoders.
fs/compat_ioctl.c +1 -1
@@ -687,7 +687,7 @@ static int dev_ifconf(unsigned int fd, u ifr = ifc.ifc_req; ifr32 =compat_ptr (ifc32.ifcbuf);for (i =0 , j =0 ; - i +sizeof (struct ifreq32 ) < ifc32.ifc_len && j < ifc.ifc_len; + i +sizeof (struct ifreq32 ) <= ifc32.ifc_len && j < ifc.ifc_len; i +=sizeof (struct ifreq32 ), j +=sizeof (struct ifreq )) {if (copy_in_user (ifr32, ifr,sizeof (struct ifreq32 )))return -EFAULT ;
fs/cramfs/inode.c +29 -31
81 lines not on this page · raw message
fs/ext2/dir.c +12 -16
@@ -256,11 +256,10 @@ ext2_readdir (struct file * filp, void *unsigned long npages =dir_pages (inode);unsigned chunk_mask = ~(ext2_chunk_size (inode)-1 );unsigned char *types =NULL ; -int need_revalidate = (filp->f_version != inode->i_version); -int ret; +int need_revalidate = filp->f_version != inode->i_version;if (pos > inode->i_size -EXT2_DIR_REC_LEN (1 )) - goto success; +return 0 ;if (EXT2_HAS_INCOMPAT_FEATURE (sb,EXT2_FEATURE_INCOMPAT_FILETYPE )) types = ext2_filetype_table;
@@ -275,12 +274,15 @@ ext2_readdir (struct file * filp, void *"bad page in #%lu" , inode->i_ino); filp->f_pos +=PAGE_CACHE_SIZE - offset; - ret = -EIO ; - goto done; +return -EIO ; } kaddr =page_address (page); -if (need_revalidate) { - offset =ext2_validate_entry (kaddr, offset, chunk_mask); +if (unlikely (need_revalidate)) { +if (offset) { + offset =ext2_validate_entry (kaddr, offset, chunk_mask); + filp->f_pos = (n<<PAGE_CACHE_SHIFT ) + offset; + } + filp->f_version = inode->i_version; need_revalidate =0 ; } de = (ext2_dirent *)(kaddr+offset);
@@ -289,9 +291,8 @@ ext2_readdir (struct file * filp, void *if (de->rec_len ==0 ) {ext2_error (sb, __FUNCTION__,"zero-length directory entry" ); - ret = -EIO ;ext2_put_page (page); - goto done; +return -EIO ; }if (de->inode) {int over;
@@ -306,19 +307,14 @@ ext2_readdir (struct file * filp, void * le32_to_cpu(de->inode), d_type);if (over) {ext2_put_page (page); - goto success; +return 0 ; } } filp->f_pos +=le16_to_cpu (de->rec_len); }ext2_put_page (page); } - -success: - ret =0 ; -done: - filp->f_version = inode->i_version; -return ret; +return 0 ; }/*
net/core/sock.c +3 -2
@@ -403,8 +403,9 @@ set_rcvbuf:if (!valbool) { sk->sk_bound_dev_if =0 ; }else { -if (optlen >IFNAMSIZ ) - optlen =IFNAMSIZ ; +if (optlen >IFNAMSIZ -1 ) + optlen =IFNAMSIZ -1 ; +memset (devname,0 ,sizeof (devname));if (copy_from_user (devname, optval, optlen)) { ret = -EFAULT ;break ;
net/ipv4/ip_output.c +1 -5
@@ -1237,11 +1237,7 @@ int ip_push_pending_frames(struct sock * iph->tos = inet->tos; iph->tot_len =htons (skb->len); iph->frag_off = df; -if (!df) { -__ip_select_ident (iph, &rt->u.dst,0 ); - }else { - iph->id =htons (inet->id++); - } +ip_select_ident (iph, &rt->u.dst, sk); iph->ttl = ttl; iph->protocol = sk->sk_protocol; iph->saddr = rt->rt_src;
net/ipv4/netfilter/ip_queue.c +1 -1
@@ -524,7 +524,7 @@ ipq_rcv_skb(struct sk_buff *skb)write_unlock_bh (&queue_lock); status =ipq_receive_peer (NLMSG_DATA (nlh), type, - skblen -NLMSG_LENGTH (0 )); + nlmsglen -NLMSG_LENGTH (0 ));if (status <0 )RCV_SKB_FAIL (status);
net/ipv6/netfilter/ip6_queue.c +1 -1
@@ -522,7 +522,7 @@ ipq_rcv_skb(struct sk_buff *skb)write_unlock_bh (&queue_lock); status =ipq_receive_peer (NLMSG_DATA (nlh), type, - skblen -NLMSG_LENGTH (0 )); + nlmsglen -NLMSG_LENGTH (0 ));if (status <0 )RCV_SKB_FAIL (status);