Linux 2.6.18.5
Subsystems (14)
We (the -stable team) are announcing the release of the 2.6.18.5 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.18.4 and 2.6.18.5, as it is small enough to do so.
The updated 2.6.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
-chris
--------
Makefile | 2 arch/alpha/Kconfig | 2 arch/i386/kernel/microcode.c | 9 -- arch/ia64/sn/kernel/bte.c | 9 +- block/scsi_ioctl.c | 3 drivers/char/agp/generic.c | 2 drivers/char/agp/intel-agp.c | 2 drivers/media/Kconfig | 1 drivers/net/tg3.c | 4 - drivers/net/wireless/bcm43xx/bcm43xx_main.c | 18 ++++ drivers/pcmcia/ds.c | 5 + drivers/scsi/scsi_lib.c | 1 fs/fuse/dir.c | 52 +++++++++---- include/linux/netfilter_ipv4.h | 2 net/bluetooth/hci_sock.c | 11 +- net/dccp/ipv6.c | 2 net/ieee80211/softmac/ieee80211softmac_io.c | 2 net/ipv4/ipvs/ip_vs_core.c | 10 ++ net/ipv4/netfilter.c | 9 +- net/ipv4/netfilter/arp_tables.c | 39 ++++++--- net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 - net/ipv4/netfilter/ip_nat_standalone.c | 3 net/ipv4/netfilter/ip_tables.c | 103 +++++++++++++------------- net/ipv4/netfilter/iptable_mangle.c | 3 net/ipv4/udp.c | 19 +++- net/ipv6/netfilter/ip6_tables.c | 53 ++++++------- net/ipv6/udp.c | 7 - net/netfilter/Kconfig | 6 + 28 files changed, 231 insertions(+), 152 deletions(-)
Summary of changes from v2.6.18.4 to v2.6.18.5
============================================
Chris Wright:
Linux 2.6.18.5
Daniel Ritz:
pcmcia: fix 'rmmod pcmcia' with unbound devices
David S. Miller:
BLUETOOTH: Fix unaligned access in hci_send_to_sock.
Fernando J. Pereda:
alpha: Fix ALPHA_EV56 dependencies typo
Ira W. Snyder:
TG3: Add missing unlock in tg3_open() error path.
Laurent Riffard:
softmac: fix a slab corruption in WEP restricted key association
Linus Torvalds:
AGP: Allocate AGP pages with GFP_DMA32 by default
Maciej W. Rozycki:
V4L: Do not enable VIDEO_V4L2 unconditionally
Michael Buesch:
bcm43xx: Drain TX status before starting IRQs
Miklos Szeredi:
fuse: fix Oops in lookup
Olaf Kirch:
UDP: Make udp_encap_rcv use pskb_may_pull
Patrick McHardy:
NETFILTER: Missing check for CAP_NET_ADMIN in iptables compat layer
NETFILTER: ip_tables: compat error way cleanup
NETFILTER: ip_tables: fix module refcount leaks in compat error paths
NETFILTER: Missed and reordered checks in {arp,ip,ip6}_tables
NETFILTER: arp_tables: missing unregistration on module unload
NETFILTER: Honour source routing for LVS-NAT
NETFILTER: Kconfig: fix xt_physdev dependencies
NETFILTER: xt_CONNSECMARK: fix Kconfig dependencies
NETFILTER: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
Robin Holt:
IA64: bte_unaligned_copy() transfers one extra cache line.
Shaohua Li:
x86 microcode: don't check the size
Tejun Heo:
scsi: clear garbage after CDBs on SG_IO
YOSHIFUJI Hideaki:
IPV6: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME=Avast! A bilge rat! # *DOCUMENTATION*
arch/alpha/Kconfig +1 -1
@@ -381,7 +381,7 @@ config ALPHA_EV56 config ALPHA_EV56 prompt "EV56 CPU (speed >= 333MHz)?" - depends on ALPHA_NORITAKE && ALPHA_PRIMO + depends on ALPHA_NORITAKE || ALPHA_PRIMO config ALPHA_EV56 prompt "EV56 CPU (speed >= 400MHz)?"
arch/i386/kernel/microcode.c +2 -7
@@ -250,14 +250,14 @@ static int find_matching_ucodes (void) } total_size =get_totalsize (&mc_header); -if ((cursor + total_size > user_buffer_size) || (total_size <DEFAULT_UCODE_TOTALSIZE )) { +if (cursor + total_size > user_buffer_size) {printk (KERN_ERR "microcode: error! Bad data in microcode data file\n" ); error = -EINVAL ; goto out; } data_size =get_datasize (&mc_header); -if ((data_size +MC_HEADER_SIZE > total_size) || (data_size <DEFAULT_UCODE_DATASIZE )) { +if (data_size +MC_HEADER_SIZE > total_size) {printk (KERN_ERR "microcode: error! Bad data in microcode data file\n" ); error = -EINVAL ; goto out;
@@ -460,11 +460,6 @@ static ssize_t microcode_write (struct f {ssize_t ret; -if (len <DEFAULT_UCODE_TOTALSIZE ) { -printk (KERN_ERR "microcode: not enough data\n" ); -return -EINVAL ; - } -if ((len >>PAGE_SHIFT ) > num_physpages) {printk (KERN_ERR "microcode: too much data (max %ld pages)\n" , num_physpages);return -EINVAL ;
arch/ia64/sn/kernel/bte.c +4 -5
@@ -382,14 +382,13 @@ bte_result_t bte_unaligned_copy(u64 src,* bcopy to the destination. */ -/* Add the leader from source */ - headBteLen = len + (src &L1_CACHE_MASK ); -/* Add the trailing bytes from footer. */ - headBteLen +=L1_CACHE_BYTES - (headBteLen &L1_CACHE_MASK ); - headBteSource = src & ~L1_CACHE_MASK ; headBcopySrcOffset = src &L1_CACHE_MASK ; headBcopyDest = dest; headBcopyLen = len; + + headBteSource = src - headBcopySrcOffset; +/* Add the leading and trailing bytes from source */ + headBteLen =L1_CACHE_ALIGN (len + headBcopySrcOffset); }if (headBcopyLen >0 ) {
block/scsi_ioctl.c +1 -2
@@ -286,9 +286,8 @@ static int sg_io(struct file *file, requ* fill in request structure */ rq->cmd_len = hdr->cmd_len; +memset (rq->cmd,0 ,BLK_MAX_CDB );/* ATAPI hates garbage after CDB */ memcpy (rq->cmd, cmd, hdr->cmd_len); -if (sizeof (rq->cmd) != hdr->cmd_len) -memset (rq->cmd + hdr->cmd_len,0 ,sizeof (rq->cmd) - hdr->cmd_len);memset (sense,0 ,sizeof (sense)); rq->sense = sense;
drivers/char/agp/generic.c +1 -1
@@ -1042,7 +1042,7 @@ void *agp_generic_alloc_page(struct agp_ {struct page * page; - page =alloc_page (GFP_KERNEL ); + page =alloc_page (GFP_KERNEL |GFP_DMA32 );if (page ==NULL )return NULL ;
drivers/char/agp/intel-agp.c +1 -1
@@ -160,7 +160,7 @@ static void *i8xx_alloc_pages(void) {struct page * page; - page =alloc_pages (GFP_KERNEL ,2 ); + page =alloc_pages (GFP_KERNEL |GFP_DMA32 ,2 );if (page ==NULL )return NULL ;
drivers/media/Kconfig +1 -0
@@ -54,6 +54,7 @@ config VIDEO_V4L1_COMPAT config VIDEO_V4L2 bool + depends on VIDEO_DEV default y source "drivers/media/video/Kconfig"
drivers/net/tg3.c +3 -1
@@ -6889,8 +6889,10 @@ static int tg3_open(struct net_device *dtg3_full_lock (tp,0 ); err =tg3_set_power_state (tp,PCI_D0 ); -if (err) +if (err) { +tg3_full_unlock (tp);return err; + }tg3_disable_ints (tp); tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE ;
drivers/net/wireless/bcm43xx/bcm43xx_main.c +18 -0
@@ -1463,6 +1463,23 @@ static void handle_irq_transmit_status(s } } +static void drain_txstatus_queue (struct bcm43xx_private *bcm) +{ +u32 dummy; + +if (bcm->current_core->rev <5 ) +return ; +/* Read all entries from the microcode TXstatus FIFO +* and throw them away. +*/ +while (1 ) { + dummy =bcm43xx_read32 (bcm, BCM43xx_MMIO_XMITSTAT_0); +if (!dummy) +break ; + dummy =bcm43xx_read32 (bcm, BCM43xx_MMIO_XMITSTAT_1); + } +} +static void bcm43xx_generate_noise_sample (struct bcm43xx_private *bcm) {bcm43xx_shm_write16 (bcm, BCM43xx_SHM_SHARED,0x408 ,0x7F7F );
@@ -3517,6 +3534,7 @@ int bcm43xx_select_wireless_core(structbcm43xx_macfilter_clear (bcm, BCM43xx_MACFILTER_ASSOC);bcm43xx_macfilter_set (bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm->net_dev->dev_addr));bcm43xx_security_init (bcm); +drain_txstatus_queue (bcm);ieee80211softmac_start (bcm->net_dev);/* Let's go! Be careful after enabling the IRQs.
drivers/pcmcia/ds.c +5 -0
@@ -1264,6 +1264,11 @@ static void pcmcia_bus_remove_socket(str socket->pcmcia_state.dead =1 ;pccard_register_pcmcia (socket,NULL ); +/* unregister any unbound devices */ +mutex_lock (&socket->skt_mutex); +pcmcia_card_remove (socket,NULL ); +mutex_unlock (&socket->skt_mutex); +pcmcia_put_socket (socket);return ;
drivers/scsi/scsi_lib.c +1 -0
@@ -408,6 +408,7 @@ int scsi_execute_async(struct scsi_devic goto free_req; req->cmd_len = cmd_len; +memset (req->cmd,0 ,BLK_MAX_CDB );/* ATAPI hates garbage after CDB */ memcpy (req->cmd, cmd, req->cmd_len); req->sense = sioc->sense; req->sense_len =0 ;
fs/fuse/dir.c +38 -14
129 lines not on this page · raw message
include/linux/netfilter_ipv4.h +1 -1
@@ -77,7 +77,7 @@ enum nf_ip_hook_priorities {#define SO_ORIGINAL_DST 80#ifdef __KERNEL__ -extern int ip_route_me_harder (struct sk_buff **pskb); +extern int ip_route_me_harder (struct sk_buff **pskb,unsigned addr_type);extern int ip_xfrm_me_harder (struct sk_buff **pskb);extern unsigned int nf_ip_checksum (struct sk_buff *skb,unsigned int hook,unsigned int dataoff,u_int8_t protocol);
net/bluetooth/hci_sock.c +7 -4
@@ -120,10 +120,13 @@ void hci_send_to_sock(struct hci_dev *hdif (!hci_test_bit (evt, &flt->event_mask))continue ; -if (flt->opcode && ((evt ==HCI_EV_CMD_COMPLETE && - flt->opcode != *(__u16 *)(skb->data +3 )) || - (evt ==HCI_EV_CMD_STATUS && - flt->opcode != *(__u16 *)(skb->data +4 )))) +if (flt->opcode && + ((evt ==HCI_EV_CMD_COMPLETE && + flt->opcode != +get_unaligned ((__u16 *)(skb->data +3 ))) || + (evt ==HCI_EV_CMD_STATUS && + flt->opcode != +get_unaligned ((__u16 *)(skb->data +4 )))))continue ; }
net/dccp/ipv6.c +1 -1
@@ -276,7 +276,7 @@ static void dccp_v6_err(struct sk_buff *__u64 seq; sk =inet6_lookup (&dccp_hashinfo, &hdr->daddr, dh->dccph_dport, - &hdr->saddr, dh->dccph_sport, skb->dev->ifindex); + &hdr->saddr, dh->dccph_sport,inet6_iif (skb));if (sk ==NULL ) {ICMP6_INC_STATS_BH (__in6_dev_get (skb->dev),ICMP6_MIB_INERRORS );
net/ieee80211/softmac/ieee80211softmac_io.c +1 -1
@@ -304,7 +304,7 @@ ieee80211softmac_auth(struct ieee80211_a2 +/* Auth Transaction Seq */ 2 +/* Status Code */ /* Challenge Text IE */ - is_shared_response ?0 :1 +1 + net->challenge_len + (is_shared_response ?1 +1 + net->challenge_len :0 ) );if (unlikely ((*pkt) ==NULL ))return 0 ;
net/ipv4/ipvs/ip_vs_core.c +10 -0
@@ -813,6 +813,16 @@ ip_vs_out(unsigned int hooknum, struct s skb->nh.iph->saddr = cp->vaddr;ip_send_check (skb->nh.iph); +/* For policy routing, packets originating from this +* machine itself may be routed differently to packets +* passing through. We want this packet to be routed as +* if it came from this machine itself. So re-compute +* the routing information. +*/ +if (ip_route_me_harder (pskb,RTN_LOCAL ) !=0 ) + goto drop; + skb = *pskb; +IP_VS_DBG_PKT (10 , pp, skb,0 ,"After SNAT" );ip_vs_out_stats (cp, skb);
net/ipv4/netfilter.c +6 -3
@@ -8,7 +8,7 @@ #include <net/xfrm.h>#include <net/ip.h> /* route_me_harder function, used by iptable_nat, iptable_mangle + ip_queue */ -int ip_route_me_harder (struct sk_buff **pskb) +int ip_route_me_harder (struct sk_buff **pskb,unsigned addr_type) {struct iphdr *iph = (*pskb)->nh.iph;struct rtable *rt;
@@ -16,10 +16,13 @@ int ip_route_me_harder(struct sk_buff **struct dst_entry *odst;unsigned int hh_len; +if (addr_type ==RTN_UNSPEC ) + addr_type =inet_addr_type (iph->saddr); +/* some non-standard hacks like ipt_REJECT.c:send_reset() can cause * packets with foreign saddr to appear on the NF_IP_LOCAL_OUT hook. */ -if (inet_addr_type (iph->saddr) ==RTN_LOCAL ) { +if (addr_type ==RTN_LOCAL ) { fl.nl_u.ip4_u.daddr = iph->daddr; fl.nl_u.ip4_u.saddr = iph->saddr; fl.nl_u.ip4_u.tos =RT_TOS (iph->tos);
@@ -156,7 +159,7 @@ static int nf_ip_reroute(struct sk_buffif (!(iph->tos == rt_info->tos && iph->daddr == rt_info->daddr && iph->saddr == rt_info->saddr)) -return ip_route_me_harder (pskb); +return ip_route_me_harder (pskb,RTN_UNSPEC ); }return 0 ; }
net/ipv4/netfilter/arp_tables.c +24 -15
@@ -380,6 +380,13 @@ static int mark_source_chains(struct xt_ && unconditional(&e->arp)) {unsigned int oldpos, size; +if (t->verdict < -NF_MAX_VERDICT -1 ) { +duprintf ("mark_source_chains: bad " +"negative verdict (%i)\n" , + t->verdict); +return 0 ; + } +/* Return: backtrack through the last * big jump. */
@@ -409,6 +416,14 @@ static int mark_source_chains(struct xt_if (strcmp (t->target.u.user.name,ARPT_STANDARD_TARGET ) ==0 && newpos >=0 ) { +if (newpos > newinfo->size - +sizeof (struct arpt_entry )) { +duprintf ("mark_source_chains: " +"bad verdict (%i)\n" , + newpos); +return 0 ; + } +/* This a jump; chase it. */ duprintf ("Jump rule %u -> %u\n" , pos, newpos);
@@ -431,8 +446,6 @@ static int mark_source_chains(struct xt_static inline int standard_check (const struct arpt_entry_target *t,unsigned int max_offset) { -struct arpt_standard_target *targ = (void *)t; -/* Check standard info. */ if (t->u.target_size !=ARPT_ALIGN (sizeof (struct arpt_standard_target ))) {
@@ -442,18 +455,6 @@ static inline int standard_check(const sreturn 0 ; } -if (targ->verdict >=0 - && targ->verdict > max_offset -sizeof (struct arpt_entry )) { -duprintf ("arpt_standard_check: bad verdict (%i)\n" , - targ->verdict); -return 0 ; - } - -if (targ->verdict < -NF_MAX_VERDICT -1 ) { -duprintf ("arpt_standard_check: bad negative verdict (%i)\n" , - targ->verdict); -return 0 ; - }return 1 ; }
@@ -471,7 +472,13 @@ static inline int check_entry(struct arpreturn -EINVAL ; } +if (e->target_offset +sizeof (struct arpt_entry_target ) > e->next_offset) +return -EINVAL ; + t =arpt_get_target (e); +if (e->target_offset + t->u.target_size > e->next_offset) +return -EINVAL ; + target =try_then_request_module (xt_find_target (NF_ARP , t->u.user.name, t->u.user.revision),"arpt_%s" , t->u.user.name);
@@ -641,7 +648,7 @@ static int translate_table(const char *nif (ret !=0 ) {ARPT_ENTRY_ITERATE (entry0, newinfo->size, - cleanup_entry, &i); + cleanup_entry, &i);return ret; }
@@ -1204,6 +1211,8 @@ err1: static void __exit arp_tables_fini(void) {nf_unregister_sockopt (&arpt_sockopts); +xt_unregister_target (&arpt_error_target); +xt_unregister_target (&arpt_standard_target);xt_proto_fini (NF_ARP ); }
net/ipv4/netfilter/ip_conntrack_helper_h323.c +2 -2
@@ -1417,7 +1417,7 @@ static int process_rcf(struct sk_buff **DEBUGP ("ip_ct_ras: set RAS connection timeout to %u seconds\n" , info->timeout); -ip_ct_refresh_acct (ct, ctinfo,NULL , info->timeout *HZ ); +ip_ct_refresh (ct, *pskb, info->timeout *HZ );/* Set expect timeout */ read_lock_bh (&ip_conntrack_lock);
@@ -1465,7 +1465,7 @@ static int process_urq(struct sk_buff ** info->sig_port[!dir] =0 ;/* Give it 30 seconds for UCF or URJ */ -ip_ct_refresh_acct (ct, ctinfo,NULL ,30 *HZ ); +ip_ct_refresh (ct, *pskb,30 *HZ );return 0 ; }
net/ipv4/netfilter/ip_nat_standalone.c +2 -1
@@ -275,7 +275,8 @@ #ifdef CONFIG_XFRM ct->tuplehash[!dir].tuple.src.u.all #endif ) - return ip_route_me_harder(pskb) == 0 ? ret : NF_DROP; +if (ip_route_me_harder (pskb,RTN_UNSPEC )) + ret = NF_DROP; }return ret; }
net/ipv4/netfilter/ip_tables.c +53 -50
241 lines not on this page · raw message
net/ipv4/netfilter/iptable_mangle.c +2 -1
@@ -157,7 +157,8 @@ #ifdef CONFIG_IP_ROUTE_FWMARK || (*pskb)->nfmark != nfmark #endif || (*pskb)->nh.iph->tos != tos)) -return ip_route_me_harder (pskb) ==0 ? ret :NF_DROP ; +if (ip_route_me_harder (pskb,RTN_UNSPEC )) + ret =NF_DROP ; return ret; }
net/ipv4/udp.c +14 -5
@@ -892,23 +892,32 @@ #ifndef CONFIG_XFRMreturn 1 ;#else struct udp_sock *up =udp_sk (sk); -struct udphdr *uh = skb->h.uh; +struct udphdr *uh;struct iphdr *iph;int iphlen, len; -__u8 *udpdata = (__u8 *)uh +sizeof (struct udphdr ); -__u32 *udpdata32 = (__u32 *)udpdata; +__u8 *udpdata; +__u32 *udpdata32;__u16 encap_type = up->encap_type;/* if we're overly short, let UDP handle it */ -if (udpdata > skb->tail) + len = skb->len -sizeof (struct udphdr ); +if (len <=0 )return 1 ;/* if this is not encapsulated socket, then just return now */ if (!encap_type)return 1 ; - len = skb->tail - udpdata; +/* If this is a paged skb, make sure we pull up +* whatever data we need to look at. */ +if (!pskb_may_pull (skb,sizeof (struct udphdr ) +min (len,8 ))) +return 1 ; + +/* Now we can get the pointers */ + uh = skb->h.uh; + udpdata = (__u8 *)uh +sizeof (struct udphdr ); + udpdata32 = (__u32 *)udpdata;switch (encap_type) {default :
net/ipv6/netfilter/ip6_tables.c +24 -29
101 lines not on this page · raw message
net/ipv6/udp.c +3 -4
@@ -314,14 +314,13 @@ static void udpv6_err(struct sk_buff *sk {struct ipv6_pinfo *np;struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data; -struct net_device *dev = skb->dev;struct in6_addr *saddr = &hdr->saddr;struct in6_addr *daddr = &hdr->daddr;struct udphdr *uh = (struct udphdr *)(skb->data+offset);struct sock *sk;int err; - sk =udp_v6_lookup (daddr, uh->dest, saddr, uh->source, dev->ifindex); + sk =udp_v6_lookup (daddr, uh->dest, saddr, uh->source,inet6_iif (skb));if (sk ==NULL )return ;
@@ -415,7 +414,7 @@ static void udpv6_mcast_deliver(struct uread_lock (&udp_hash_lock); sk =sk_head (&udp_hash[ntohs (uh->dest) & (UDP_HTABLE_SIZE -1 )]); - dif = skb->dev->ifindex; + dif =inet6_iif (skb); sk =udp_v6_mcast_next (sk, uh->dest, daddr, uh->source, saddr, dif);if (!sk) {kfree_skb (skb);
@@ -496,7 +495,7 @@ static int udpv6_rcv(struct sk_buff **ps* check socket cache ... must talk to Alan about his plans * for sock caches... i'll skip this for now. */ - sk =udp_v6_lookup (saddr, uh->source, daddr, uh->dest, dev->ifindex); + sk =udp_v6_lookup (saddr, uh->source, daddr, uh->dest,inet6_iif (skb));if (sk ==NULL ) {if (!xfrm6_policy_check (NULL ,XFRM_POLICY_IN , skb))
net/netfilter/Kconfig +4 -2
@@ -197,7 +197,9 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_CONNSECMARK tristate '"CONNSECMARK" target support' - depends on NETFILTER_XTABLES && (NF_CONNTRACK_SECMARK || IP_NF_CONNTRACK_SECMARK) + depends on NETFILTER_XTABLES && \ + ((NF_CONNTRACK && NF_CONNTRACK_SECMARK) || \ + (IP_NF_CONNTRACK && IP_NF_CONNTRACK_SECMARK)) help The CONNSECMARK target copies security markings from packets to connections, and restores security markings from connections
@@ -342,7 +344,7 @@ config NETFILTER_XT_MATCH_MULTIPORT config NETFILTER_XT_MATCH_PHYSDEV tristate '"physdev" match support' - depends on NETFILTER_XTABLES && BRIDGE_NETFILTER + depends on NETFILTER_XTABLES && BRIDGE && BRIDGE_NETFILTER help Physdev packet matching matches against the physical bridge ports the IP packet arrived on or will leave by.