diff options
Diffstat (limited to '3.2.69')
| -rw-r--r-- | 3.2.69/0000_README | 2 | ||||
| -rw-r--r-- | 3.2.69/4420_grsecurity-3.1-3.2.69-201507050830.patch (renamed from 3.2.69/4420_grsecurity-3.1-3.2.69-201506300708.patch) | 37 |
2 files changed, 35 insertions, 4 deletions
diff --git a/3.2.69/0000_README b/3.2.69/0000_README index d006716..6773701 100644 --- a/3.2.69/0000_README +++ b/3.2.69/0000_README @@ -194,7 +194,7 @@ Patch: 1068_linux-3.2.69.patch From: http://www.kernel.org Desc: Linux 3.2.69 -Patch: 4420_grsecurity-3.1-3.2.69-201506300708.patch +Patch: 4420_grsecurity-3.1-3.2.69-201507050830.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.2.69/4420_grsecurity-3.1-3.2.69-201506300708.patch b/3.2.69/4420_grsecurity-3.1-3.2.69-201507050830.patch index e8aabfa..57ddd0b 100644 --- a/3.2.69/4420_grsecurity-3.1-3.2.69-201506300708.patch +++ b/3.2.69/4420_grsecurity-3.1-3.2.69-201507050830.patch @@ -59119,6 +59119,28 @@ index 5ef72c8..0c72810 100644 /* * We'll have a dentry and an inode for +diff --git a/fs/configfs/item.c b/fs/configfs/item.c +index 50cee7f..8238ebd 100644 +--- a/fs/configfs/item.c ++++ b/fs/configfs/item.c +@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item, + const char *name, + struct config_item_type *type) + { +- config_item_set_name(item, name); ++ config_item_set_name(item, "%s", name); + item->ci_type = type; + config_item_init(item); + } +@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name); + void config_group_init_type_name(struct config_group *group, const char *name, + struct config_item_type *type) + { +- config_item_set_name(&group->cg_item, name); ++ config_item_set_name(&group->cg_item, "%s", name); + group->cg_item.ci_type = type; + config_group_init(group); + } diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c index 276e15c..aeac324 100644 --- a/fs/configfs/mount.c @@ -73326,7 +73348,7 @@ index 0000000..b916759 +} diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c new file mode 100644 -index 0000000..35f8064 +index 0000000..e0bbcf4 --- /dev/null +++ b/grsecurity/gracl_ip.c @@ -0,0 +1,386 @@ @@ -73400,7 +73422,7 @@ index 0000000..35f8064 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25", + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash", + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28", -+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf" ++ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc" + }; + +const char * @@ -81044,9 +81066,18 @@ index 51494e6..340575ab 100644 extern bool completion_done(struct completion *x); diff --git a/include/linux/configfs.h b/include/linux/configfs.h -index 3081c58..7714c00 100644 +index 3081c58..5a0b545 100644 --- a/include/linux/configfs.h +++ b/include/linux/configfs.h +@@ -64,7 +64,7 @@ struct config_item { + struct dentry *ci_dentry; + }; + +-extern int config_item_set_name(struct config_item *, const char *, ...); ++extern __printf(2, 3) int config_item_set_name(struct config_item *, const char *, ...); + + static inline char *config_item_name(struct config_item * item) + { @@ -125,7 +125,7 @@ struct configfs_attribute { const char *ca_name; struct module *ca_owner; |