Linux 3.0.26
Greg KH
maintainerI'm announcing the release of the 3.0.26 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 - arch/powerpc/platforms/powermac/smp.c | 2 - drivers/net/wireless/iwlegacy/iwl-3945.c | 7 +++--- drivers/net/wireless/iwlegacy/iwl3945-base.c | 2 - fs/afs/internal.h | 2 - fs/afs/rxrpc.c | 3 ++ fs/nilfs2/the_nilfs.c | 1 net/ipv4/syncookies.c | 30 ++++++++++++++------------- net/ipv4/tcp_ipv4.c | 10 ++++++--- net/ipv6/mcast.c | 1 tools/perf/util/sort.c | 3 ++ 11 files changed, 38 insertions(+), 25 deletions(-)
Anton Blanchard (3):
afs: Read of file returns EBADMSG
afs: Remote abort can cause BUG in rxrpc code perf tools: Incorrect use of snprintf results in SEGV
Benjamin Herrenschmidt (1):
powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
Eric Dumazet (1):
tcp: fix syncookie regression
Greg Kroah-Hartman (1):
Linux 3.0.26
RongQing.Li (1):
ipv6: Don't dev_hold(dev) in ip6_mc_find_dev_rcu.
Ryusuke Konishi (1):
nilfs2: fix NULL pointer dereference in nilfs_load_super_block()
Stanislaw Gruszka (1):
iwl3945: fix possible il->txq NULL pointer dereference in delayed works
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 25 +SUBLEVEL = 26 EXTRAVERSION = NAME = Sneaky Weasel
arch/powerpc/platforms/powermac/smp.c +1 -1
@@ -414,7 +414,7 @@ static struct irqaction psurge_irqaction = {static void __init smp_psurge_setup_cpu (int cpu_nr) { -if (cpu_nr !=0 ) +if (cpu_nr !=0 || !psurge_start)return ;/* reset the entry point so if we get another intr we won't
drivers/net/wireless/iwlegacy/iwl-3945.c +4 -3
@@ -1872,11 +1872,12 @@ static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work) struct iwl_priv *priv = container_of(work, struct iwl_priv, _3945.thermal_periodic.work); -if (test_bit (STATUS_EXIT_PENDING , &priv->status)) -return ; -mutex_lock (&priv->mutex); +if (test_bit (STATUS_EXIT_PENDING , &priv->status) || priv->txq ==NULL ) + goto out; +iwl3945_reg_txpower_periodic (priv); +out:mutex_unlock (&priv->mutex); }
drivers/net/wireless/iwlegacy/iwl3945-base.c +1 -1
@@ -2763,7 +2763,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data) container_of(data, struct iwl_priv, alive_start.work);mutex_lock (&priv->mutex); -if (test_bit (STATUS_EXIT_PENDING , &priv->status)) +if (test_bit (STATUS_EXIT_PENDING , &priv->status) || priv->txq ==NULL ) goto out;iwl3945_alive_start (priv);
fs/afs/internal.h +1 -1
@@ -109,7 +109,7 @@ struct afs_call {unsigned reply_size;/* current size of reply */ unsigned first_offset;/* offset into mapping[first] */ unsigned last_to;/* amount of mapping[last] */ -unsigned short offset;/* offset into received data store */ +unsigned offset;/* offset into received data store */ unsigned char unmarshall;/* unmarshalling phase */ bool incoming;/* T if incoming call */ bool send_pages;/* T if data from mapping should be sent */
fs/afs/rxrpc.c +3 -0
@@ -314,6 +314,7 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp,struct msghdr msg;struct kvec iov[1 ];int ret; +struct sk_buff *skb;_enter ("%x,{%d}," , addr->s_addr,ntohs (call->port));
@@ -380,6 +381,8 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, error_do_abort:rxrpc_kernel_abort_call (rxcall,RX_USER_ABORT ); +while ((skb =skb_dequeue (&call->rx_queue))) +afs_free_skb (skb);rxrpc_kernel_end_call (rxcall); call->rxcall =NULL ; error_kill_call:
fs/nilfs2/the_nilfs.c +1 -0
@@ -515,6 +515,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,brelse (sbh[1 ]); sbh[1 ] =NULL ; sbp[1 ] =NULL ; + valid[1 ] =0 ; swp =0 ; }if (!valid[swp]) {
net/ipv4/syncookies.c +16 -14
@@ -277,6 +277,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,struct rtable *rt;__u8 rcv_wscale;bool ecn_ok = false; +struct flowi4 fl4;if (!sysctl_tcp_syncookies || !th->ack || th->rst) goto out;
@@ -344,20 +345,16 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,* hasn't changed since we received the original syn, but I see * no easy way to do this. */ - { -struct flowi4 fl4; - -flowi4_init_output (&fl4,0 , sk->sk_mark,RT_CONN_FLAGS (sk), -RT_SCOPE_UNIVERSE ,IPPROTO_TCP , -inet_sk_flowi_flags (sk), - (opt && opt->srr) ? opt->faddr : ireq->rmt_addr, - ireq->loc_addr, th->source, th->dest); -security_req_classify_flow (req,flowi4_to_flowi (&fl4)); - rt =ip_route_output_key (sock_net (sk), &fl4); -if (IS_ERR (rt)) { -reqsk_free (req); - goto out; - } +flowi4_init_output (&fl4,0 , sk->sk_mark,RT_CONN_FLAGS (sk), +RT_SCOPE_UNIVERSE ,IPPROTO_TCP , +inet_sk_flowi_flags (sk), + (opt && opt->srr) ? opt->faddr : ireq->rmt_addr, + ireq->loc_addr, th->source, th->dest); +security_req_classify_flow (req,flowi4_to_flowi (&fl4)); + rt =ip_route_output_key (sock_net (sk), &fl4); +if (IS_ERR (rt)) { +reqsk_free (req); + goto out; }/* Try to redo what tcp_v4_send_synack did. */
@@ -371,5 +368,10 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, ireq->rcv_wscale = rcv_wscale; ret =get_cookie_sock (sk, skb, req, &rt->dst); +/* ip_queue_xmit() depends on our flow being setup +* Normal sockets get it right from inet_csk_route_child_sock() +*/ +if (ret) +inet_sk (ret)->cork.fl.u.ip4 = fl4; out:return ret; }
net/ipv4/tcp_ipv4.c +7 -3
@@ -1454,9 +1454,13 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,inet_csk (newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen; newinet->inet_id = newtp->write_seq ^ jiffies; -if (!dst && (dst =inet_csk_route_child_sock (sk, newsk, req)) ==NULL ) - goto put_and_exit; - +if (!dst) { + dst =inet_csk_route_child_sock (sk, newsk, req); +if (!dst) + goto put_and_exit; + }else { +/* syncookie case : see end of cookie_v4_check() */ + }sk_setup_caps (newsk, dst);tcp_mtup_init (newsk);
net/ipv6/mcast.c +0 -1
@@ -257,7 +257,6 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,if (rt) { dev = rt->rt6i_dev; -dev_hold (dev);dst_release (&rt->dst); } }else
tools/perf/util/sort.c +3 -0
@@ -122,6 +122,9 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...) } }va_end (ap); + +if (n >= (int )size) +return size -1 ;return n; }