Linux 2.6.31.12
Subsystems (11)
I'm announcing the release of the 2.6.31.12 kernel. All users of the .31 kernel series are strongly encouraged to upgrade.
No, forget that, all users of the .31 kernel series as released by the -stable team should move to the .32 kernel series as soon as possible.
This is the last .31 kernel release barring something really odd happening, so please, everyone move to .32 now, I do not know of any reason you should stick with .31 at this point in time.
The updated 2.6.31.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.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.31.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 drivers/acpi/sleep.c | 40 +++++++++++++++ drivers/hwmon/adt7462.c | 2 fs/fcntl.c | 102 +++++++++++++++++++++++++-------------- fs/quota/dquot.c | 3 + kernel/audit_tree.c | 13 +++- kernel/signal.c | 3 - net/bridge/netfilter/ebtables.c | 6 ++ net/ipv6/exthdrs.c | 7 ++ net/netfilter/nf_conntrack_ftp.c | 18 +++--- 10 files changed, 142 insertions(+), 54 deletions(-)
Al Viro (2):
fix braindamage in audit_tree.c untag_chunk() fix more leaks in audit_tree.c tag_chunk()
Andi Kleen (1):
kernel/signal.c: fix kernel information leak with print-fatal-signals=1
David S. Miller (1):
ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().
Florian Westphal (1):
netfilter: ebtables: enforce CAP_NET_ADMIN
Greg Kroah-Hartman (1):
Linux 2.6.31.12
Gustavo Maciel Dias Vieira (1):
ACPI: add DMI entry for SCI_EN resume quirk on HP dv4
Jan Kara (1):
quota: Fix dquot_transfer for filesystems different from ext4
Len Brown (2):
ACPI: sleep: another HP DMI entry for init_set_sci_en_on_resume
ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700
Linus Torvalds (1):
fasync: split 'fasync_helper()' into separate add/remove functions
Patrick McHardy (1):
netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
Roger Blofeld (1):
hwmon: (adt7462) Fix pin 28 monitoring
Vaibhav Verma (1):
ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 31 -EXTRAVERSION = .11 +EXTRAVERSION = .12 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
drivers/acpi/sleep.c +40 -0
@@ -405,6 +405,46 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, }, { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard HP Pavilion dv3 Notebook PC", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv3 Notebook PC"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv4", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Pavilion dv7", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Compaq Presario C700 Notebook PC", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario C700 Notebook PC"), + }, + }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Hewlett-Packard Compaq Presario CQ40 Notebook PC", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Compaq Presario CQ40 Notebook PC"), + }, + }, + { .callback = init_old_suspend_ordering, .ident = "Panasonic CF51-2L", .matches = {
drivers/hwmon/adt7462.c +1 -1
@@ -97,7 +97,7 @@ I2C_CLIENT_INSMOD_1(adt7462);#define ADT7462_PIN24_SHIFT 6#define ADT7462_PIN26_VOLT_INPUT 0x08#define ADT7462_PIN25_VOLT_INPUT 0x20 -#define ADT7462_PIN28_SHIFT 6/* cfg3 */ +#define ADT7462_PIN28_SHIFT 4/* cfg3 */ #define ADT7462_PIN28_VOLT 0x5#define ADT7462_REG_ALARM1 0xB8
fs/fcntl.c +66 -36
126 lines not on this page · raw message
fs/quota/dquot.c +3 -0
@@ -1425,6 +1425,9 @@ static void inode_sub_rsv_space(struct inode *inode, qsize_t number)static qsize_t inode_get_rsv_space (struct inode *inode) {qsize_t ret; + +if (!inode->i_sb->dq_op->get_reserved_space) +return 0 ;spin_lock (&inode->i_lock); ret = *inode_reserved_space (inode);spin_unlock (&inode->i_lock);
kernel/audit_tree.c +8 -5
@@ -277,7 +277,7 @@ static void untag_chunk(struct node *p) owner->root =NULL ; } -for (i = j =0 ; i < size; i++, j++) { +for (i = j =0 ; j <= size; i++, j++) {struct audit_tree *s;if (&chunk->owners[j] == p) {list_del_init (&p->list);
@@ -290,7 +290,7 @@ static void untag_chunk(struct node *p)if (!s)/* result of earlier fallback */ continue ;get_tree (s); -list_replace_init (&chunk->owners[i].list, &new->owners[j].list); +list_replace_init (&chunk->owners[j].list, &new->owners[i].list); }list_replace_rcu (&chunk->hash, &new->hash);
@@ -373,15 +373,17 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)for (n =0 ; n < old->count; n++) {if (old->owners[n].owner == tree) {spin_unlock (&hash_lock); -put_inotify_watch (watch); +put_inotify_watch (&old->watch);return 0 ; } }spin_unlock (&hash_lock); chunk =alloc_chunk (old->count +1 ); -if (!chunk) +if (!chunk) { +put_inotify_watch (&old->watch);return -ENOMEM ; + }mutex_lock (&inode->inotify_mutex);if (inotify_clone_watch (&old->watch, &chunk->watch) <0 ) {
@@ -425,7 +427,8 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&hash_lock);inotify_evict_watch (&old->watch);mutex_unlock (&inode->inotify_mutex); -put_inotify_watch (&old->watch); +put_inotify_watch (&old->watch);/* pair to inotify_find_watch */ +put_inotify_watch (&old->watch);/* and kill it */ return 0 ; }
kernel/signal.c +2 -1
@@ -939,7 +939,8 @@ static void print_fatal_signal(struct pt_regs *regs, int signr)for (i =0 ; i <16 ; i++) {unsigned char insn; -__get_user (insn, (unsigned char *)(regs->ip + i)); +if (get_user (insn, (unsigned char *)(regs->ip + i))) +break ;printk ("%02x " , insn); } }
net/bridge/netfilter/ebtables.c +6 -0
@@ -1405,6 +1405,9 @@ static int do_ebt_set_ctl(struct sock *sk, {int ret; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +switch (cmd) {case EBT_SO_SET_ENTRIES : ret =do_replace (sock_net (sk), user, len);
@@ -1424,6 +1427,9 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)struct ebt_replace tmp;struct ebt_table *t; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (copy_from_user (&tmp, user,sizeof (tmp)))return -EFAULT ;
net/ipv6/exthdrs.c +6 -1
@@ -559,6 +559,11 @@ static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)return skb_dst (skb) ?ip6_dst_idev (skb_dst (skb)) :__in6_dev_get (skb->dev); } +static inline struct net *ipv6_skb_net (struct sk_buff *skb) +{ +return skb_dst (skb) ?dev_net (skb_dst (skb)->dev) :dev_net (skb->dev); +} +/* Router Alert as of RFC 2711 */ static int ipv6_hop_ra (struct sk_buff *skb,int optoff)
@@ -580,8 +585,8 @@ static int ipv6_hop_ra(struct sk_buff *skb, int optoff)static int ipv6_hop_jumbo (struct sk_buff *skb,int optoff) {const unsigned char *nh =skb_network_header (skb); +struct net *net =ipv6_skb_net (skb);u32 pkt_len; -struct net *net =dev_net (skb_dst (skb)->dev);if (nh[optoff +1 ] !=4 || (optoff &3 ) !=2 ) { LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",
net/netfilter/nf_conntrack_ftp.c +9 -9
@@ -323,24 +323,24 @@ static void update_nl_seq(struct nf_conn *ct, u32 nl_seq, struct nf_ct_ftp_master *info, int dir, struct sk_buff *skb) { - unsigned int i, oldest = NUM_SEQ_TO_REMEMBER; + unsigned int i, oldest;/* Look for oldest: if we find exact match, we're done. */ for (i =0 ; i < info->seq_aft_nl_num[dir]; i++) {if (info->seq_aft_nl[dir][i] == nl_seq)return ; - -if (oldest == info->seq_aft_nl_num[dir] || -before (info->seq_aft_nl[dir][i], - info->seq_aft_nl[dir][oldest])) - oldest = i; }if (info->seq_aft_nl_num[dir] <NUM_SEQ_TO_REMEMBER ) { info->seq_aft_nl[dir][info->seq_aft_nl_num[dir]++] = nl_seq; - }else if (oldest !=NUM_SEQ_TO_REMEMBER && -after (nl_seq, info->seq_aft_nl[dir][oldest])) { - info->seq_aft_nl[dir][oldest] = nl_seq; + }else { +if (before (info->seq_aft_nl[dir][0 ], info->seq_aft_nl[dir][1 ])) + oldest =0 ; +else + oldest =1 ; + +if (after (nl_seq, info->seq_aft_nl[dir][oldest])) + info->seq_aft_nl[dir][oldest] = nl_seq; } }