summaryrefslogtreecommitdiff
path: root/2.6.32
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-04-28 09:02:13 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-04-28 09:02:13 -0400
commit6fefc319329e2d1683686cca57fbde4358d3b688 (patch)
tree850139c121bd598e9a636243809a7804129621f4 /2.6.32
parentGrsec/PaX: 2.9.1-{2.6.32.60,3.2.43,3.8.8}-201304181923 (diff)
downloadhardened-patchset-6fefc319329e2d1683686cca57fbde4358d3b688.tar.gz
hardened-patchset-6fefc319329e2d1683686cca57fbde4358d3b688.tar.bz2
hardened-patchset-6fefc319329e2d1683686cca57fbde4358d3b688.zip
Grsec/PaX: 2.9.1-{2.6.32.60,3.2.44,3.8.10}-20130427191620130427
Diffstat (limited to '2.6.32')
-rw-r--r--2.6.32/0000_README2
-rw-r--r--2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch (renamed from 2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304181846.patch)53
2 files changed, 46 insertions, 9 deletions
diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index d04e223..2b44ed9 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -34,7 +34,7 @@ Patch: 1059_linux-2.6.32.60.patch
From: http://www.kernel.org
Desc: Linux 2.6.32.59
-Patch: 4420_grsecurity-2.9.1-2.6.32.60-201304181846.patch
+Patch: 4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304181846.patch b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch
index 3224566..2f14145 100644
--- a/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304181846.patch
+++ b/2.6.32/4420_grsecurity-2.9.1-2.6.32.60-201304262205.patch
@@ -43603,7 +43603,7 @@ index bf2170f..ce8cab9 100644
acpi_os_unmap_memory(virt, len);
return 0;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
-index 123cedf..6664cb4 100644
+index 123cedf..f7eebb9 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -146,7 +146,7 @@ static int tty_open(struct inode *, struct file *);
@@ -43615,7 +43615,44 @@ index 123cedf..6664cb4 100644
unsigned long arg);
#else
#define tty_compat_ioctl NULL
-@@ -1774,6 +1774,7 @@ got_driver:
+@@ -856,6 +856,14 @@ void start_tty(struct tty_struct *tty)
+
+ EXPORT_SYMBOL(start_tty);
+
++static void tty_update_time(struct timespec *time)
++{
++ unsigned long sec = get_seconds();
++ sec -= sec % 60;
++ if ((long)(sec - time->tv_sec) > 0)
++ time->tv_sec = sec;
++}
++
+ /**
+ * tty_read - read method for tty device files
+ * @file: pointer to tty file
+@@ -894,8 +902,10 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
+ else
+ i = -EIO;
+ tty_ldisc_deref(ld);
++
+ if (i > 0)
+- inode->i_atime = current_fs_time(inode->i_sb);
++ tty_update_time(&inode->i_atime);
++
+ return i;
+ }
+
+@@ -995,8 +1005,7 @@ static inline ssize_t do_tty_write(
+ cond_resched();
+ }
+ if (written) {
+- struct inode *inode = file->f_path.dentry->d_inode;
+- inode->i_mtime = current_fs_time(inode->i_sb);
++ tty_update_time(&file->f_dentry->d_inode->i_mtime);
+ ret = written;
+ }
+ out:
+@@ -1774,6 +1783,7 @@ got_driver:
if (IS_ERR(tty)) {
mutex_unlock(&tty_mutex);
@@ -43623,7 +43660,7 @@ index 123cedf..6664cb4 100644
return PTR_ERR(tty);
}
}
-@@ -2603,8 +2604,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+@@ -2603,8 +2613,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return retval;
}
@@ -43635,7 +43672,7 @@ index 123cedf..6664cb4 100644
unsigned long arg)
{
struct inode *inode = file->f_dentry->d_inode;
-@@ -2628,6 +2631,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
+@@ -2628,6 +2640,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
return retval;
}
@@ -43644,7 +43681,7 @@ index 123cedf..6664cb4 100644
#endif
/*
-@@ -3073,7 +3078,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3073,7 +3087,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
{
@@ -45733,7 +45770,7 @@ index b170071..28ae90e 100644
item->object = NULL;
}
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
-index 072c281..d8ef483 100644
+index 072c281a..d8ef483 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_attrs[] = {
@@ -120907,7 +120944,7 @@ index 2f7ffa6..0455400 100644
};
diff --git a/security/security.c b/security/security.c
-index c4c6732..bc63d84 100644
+index c4c6732..5ee1542 100644
--- a/security/security.c
+++ b/security/security.c
@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1];
@@ -120935,7 +120972,7 @@ index c4c6732..bc63d84 100644
+int security_capable_noaudit(int cap)
+{
+ return security_ops->capable(current, current_cred(), cap,
-+ SECURITY_CAP_AUDIT);
++ SECURITY_CAP_NOAUDIT);
+}
+
int security_real_capable(struct task_struct *tsk, int cap)