Linux 2.6.31.14
I'm announcing the release of the 2.6.31.14 kernel.
There were a few security updates queued up for the .31 tree, and so I just pushed them out for anyone unlucky enough to still be using a .31 kernel tree. Please, move to the .32 kernel, as really, this is going to be the last .31 kernel I contemplate releaseing, and I'm sure that I haven't even gotten all of the known issues resolved with this release either.
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 +- fs/reiserfs/dir.c | 2 -- fs/reiserfs/xattr.c | 19 +++++-------------- kernel/posix-timers.c | 11 ++++------- sound/pci/mixart/mixart.c | 24 ++++++++++++++---------- 5 files changed, 24 insertions(+), 34 deletions(-)
Andrey Vagin (1):
posix_timer: Fix error path in timer_create
Dan Carpenter (1):
ALSA: mixart: range checking proc file
Greg Kroah-Hartman (1):
Linux 2.6.31.14
Jeff Mahoney (2):
reiserfs: fix permissions on .reiserfs_priv
reiserfs: fix corruption during shrinking of xattrs
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 31 -EXTRAVERSION = .13 +EXTRAVERSION = .14 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
fs/reiserfs/dir.c +0 -2
@@ -45,8 +45,6 @@ static inline bool is_privroot_deh(struct dentry *dir, struct reiserfs_de_head *deh) {struct dentry *privroot =REISERFS_SB (dir->d_sb)->priv_root; -if (reiserfs_expose_privroot (dir->d_sb)) -return 0 ;return (dir == dir->d_parent && privroot->d_inode && deh->deh_objectid ==INODE_PKEY (privroot->d_inode)->k_objectid); }
fs/reiserfs/xattr.c +5 -14
@@ -536,7 +536,7 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,if (!err && new_size <i_size_read (dentry->d_inode)) {struct iattr newattrs = { .ia_ctime =current_fs_time (inode->i_sb), - .ia_size = buffer_size, + .ia_size = new_size, .ia_valid =ATTR_SIZE |ATTR_CTIME , };mutex_lock_nested (&dentry->d_inode->i_mutex,I_MUTEX_XATTR );
@@ -952,21 +952,13 @@ int reiserfs_permission(struct inode *inode, int mask)return generic_permission (inode, mask,NULL ); } -/* This will catch lookups from the fs root to .reiserfs_priv */ -static int -xattr_lookup_poison (struct dentry *dentry,struct qstr *q1,struct qstr *name) +static int xattr_hide_revalidate (struct dentry *dentry,struct nameidata *nd) { -struct dentry *priv_root =REISERFS_SB (dentry->d_sb)->priv_root; - if (container_of(q1, struct dentry, d_name) == priv_root) -return -ENOENT ; -if (q1->len == name->len && - !memcmp (q1->name, name->name, name->len)) -return 0 ; -return 1 ; +return -EPERM ; }static const struct dentry_operations xattr_lookup_poison_ops = { - .d_compare = xattr_lookup_poison, + .d_revalidate = xattr_hide_revalidate, };int reiserfs_lookup_privroot (struct super_block *s)
@@ -980,8 +972,7 @@ int reiserfs_lookup_privroot(struct super_block *s) strlen(PRIVROOT_NAME));if (!IS_ERR (dentry)) {REISERFS_SB (s)->priv_root = dentry; -if (!reiserfs_expose_privroot (s)) - s->s_root->d_op = &xattr_lookup_poison_ops; + dentry->d_op = &xattr_lookup_poison_ops;if (dentry->d_inode) dentry->d_inode->i_flags |=S_PRIVATE ; }else
kernel/posix-timers.c +4 -7
@@ -524,14 +524,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, new_timer->it_id = (timer_t ) new_timer_id; new_timer->it_clock = which_clock; new_timer->it_overrun =-1 ; - error =CLOCK_DISPATCH (which_clock, timer_create, (new_timer)); -if (error) - goto out; -/* -* return the timer_id now. The next step is hard to -* back out if there is an error. -*/ if (copy_to_user (created_timer_id, &new_timer_id,sizeof (new_timer_id))) { error = -EFAULT ;
@@ -562,6 +555,10 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, new_timer->sigq->info.si_tid = new_timer->it_id; new_timer->sigq->info.si_code =SI_TIMER ; + error =CLOCK_DISPATCH (which_clock, timer_create, (new_timer)); +if (error) + goto out; +spin_lock_irq (¤t->sighand->siglock); new_timer->it_signal = current->signal;list_add (&new_timer->list, ¤t->signal->posix_timers);
sound/pci/mixart/mixart.c +14 -10
@@ -1161,13 +1161,15 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private unsigned long count, unsigned long pos) {struct mixart_mgr *mgr = entry->private_data; +unsigned long maxsize; - count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ -if (count <=0 ) +if (pos >=MIXART_BA0_SIZE )return 0 ; -if (pos + count >MIXART_BA0_SIZE ) - count = (long )(MIXART_BA0_SIZE - pos); -if (copy_to_user_fromio (buf,MIXART_MEM ( mgr, pos ), count)) + maxsize =MIXART_BA0_SIZE - pos; +if (count > maxsize) + count = maxsize; + count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ +if (copy_to_user_fromio (buf,MIXART_MEM (mgr, pos), count))return -EFAULT ;return count; }
@@ -1180,13 +1182,15 @@ static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private unsigned long count, unsigned long pos) {struct mixart_mgr *mgr = entry->private_data; +unsigned long maxsize; - count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ -if (count <=0 ) +if (pos >MIXART_BA1_SIZE )return 0 ; -if (pos + count >MIXART_BA1_SIZE ) - count = (long )(MIXART_BA1_SIZE - pos); -if (copy_to_user_fromio (buf,MIXART_REG ( mgr, pos ), count)) + maxsize =MIXART_BA1_SIZE - pos; +if (count > maxsize) + count = maxsize; + count = count & ~3 ;/* make sure the read size is a multiple of 4 bytes */ +if (copy_to_user_fromio (buf,MIXART_REG (mgr, pos), count))return -EFAULT ;return count; }