~ubuntu-kernel/ubuntu/+source/linux/+git/hardy:master

Last commit made on 2012-12-03
Get this branch:
git clone -b master https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/hardy
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

3661cf7... by Luis Henriques

UBUNTU: Ubuntu-2.6.24-32.107

Signed-off-by: Luis Henriques <email address hidden>

7420fe4... by Luis Henriques

ipv6: discard overlapping fragment

CVE-2012-4444

BugLink: http://bugs.launchpad.net/bugs/1079859

From: Nicolas Dichtel <nicolas.dichtel@6wind.com>

RFC5722 prohibits reassembling fragments when some data overlaps.

Bug spotted by Zhang Zuotao <zuotao.zhang@6wind.com>.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <email address hidden>

(back ported from commit 70789d7052239992824628db8133de08dc78e593)
Signed-off-by: Luis Henriques <email address hidden>
Acked-by: Herton Krzesinski <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

c5acfc7... by Luis Henriques

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Luis Henriques <email address hidden>

b731e20... by Luis Henriques

UBUNTU: Ubuntu-2.6.24-32.106

Signed-off-by: Luis Henriques <email address hidden>

dc67ccd... by Jesper Dangaard Brouer

net: fix divide by zero in tcp algorithm illinois

BugLink: http://bugs.launchpad.net/bugs/1077091

Reading TCP stats when using TCP Illinois congestion control algorithm
can cause a divide by zero kernel oops.

The division by zero occur in tcp_illinois_info() at:
 do_div(t, ca->cnt_rtt);
where ca->cnt_rtt can become zero (when rtt_reset is called)

Steps to Reproduce:
 1. Register tcp_illinois:
     # sysctl -w net.ipv4.tcp_congestion_control=illinois
 2. Monitor internal TCP information via command "ss -i"
     # watch -d ss -i
 3. Establish new TCP conn to machine

Either it fails at the initial conn, or else it needs to wait
for a loss or a reset.

This is only related to reading stats. The function avg_delay() also
performs the same divide, but is guarded with a (ca->cnt_rtt > 0) at its
calling point in update_params(). Thus, simply fix tcp_illinois_info().

Function tcp_illinois_info() / get_info() is called without
socket lock. Thus, eliminate any race condition on ca->cnt_rtt
by using a local stack variable. Simply reuse info.tcpv_rttcnt,
as its already set to ca->cnt_rtt.
Function avg_delay() is not affected by this race condition, as
its called with the socket lock.

Cc: Petr Matousek <email address hidden>
Signed-off-by: Jesper Dangaard Brouer <email address hidden>
Acked-by: Eric Dumazet <email address hidden>
Acked-by: Stephen Hemminger <email address hidden>
Signed-off-by: David S. Miller <email address hidden>

(cherry picked from commit 8f363b77ee4fbf7c3bbcf5ec2c5ca482d396d664)
CVE-2012-4565
Signed-off-by: Luis Henriques <email address hidden>
Signed-off-by: Andy Whitcroft <email address hidden>

bee0368... by Luis Henriques

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Luis Henriques <email address hidden>

f2a1941... by Luis Henriques

UBUNTU: Ubuntu-2.6.24-32.105

Signed-off-by: Luis Henriques <email address hidden>

8f3c354... by Jason Wang

net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()

CVE-2012-2136

BugLink: http://bugs.launchpad.net/bugs/1006622

We need to validate the number of pages consumed by data_len, otherwise frags
array could be overflowed by userspace. So this patch validate data_len and
return -EMSGSIZE when data_len may occupies more frags than MAX_SKB_FRAGS.

Signed-off-by: Jason Wang <email address hidden>
Signed-off-by: David S. Miller <email address hidden>
(cherry picked from commit cc9b17ad29ecaa20bfe426a8d4dbfb94b13ff1cc)

Xen applied cleanly, but openvz required some back porting.

Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Colin King <email address hidden>
Acked-by: Herton Krzesinski <email address hidden>

a0d8d88... by Luis Henriques

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Luis Henriques <email address hidden>

2922d52... by Luis Henriques

UBUNTU: Ubuntu-2.6.24-32.104

Signed-off-by: Luis Henriques <email address hidden>