From 7250559dd5700f3bb0151063c13c1ffbf81bad74 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Nov 2011 14:08:11 -0800 Subject: [PATCH] 3.0 patches added patches: crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch net-align-af-specific-flowi-structs-to-long.patch net-handle-different-key-sizes-between-address-families-in-flow-cache.patch pm-suspend-off-by-one-in-pm_suspend.patch --- ...initcall-to-prevent-races-with-aesni.patch | 34 +++++ ...gn-af-specific-flowi-structs-to-long.patch | 50 +++++++ ...tween-address-families-in-flow-cache.patch | 140 ++++++++++++++++++ .../pm-suspend-off-by-one-in-pm_suspend.patch | 33 +++++ queue-3.0/series | 4 + 5 files changed, 261 insertions(+) create mode 100644 queue-3.0/crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch create mode 100644 queue-3.0/net-align-af-specific-flowi-structs-to-long.patch create mode 100644 queue-3.0/net-handle-different-key-sizes-between-address-families-in-flow-cache.patch create mode 100644 queue-3.0/pm-suspend-off-by-one-in-pm_suspend.patch diff --git a/queue-3.0/crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch b/queue-3.0/crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch new file mode 100644 index 00000000000..6a59081fcae --- /dev/null +++ b/queue-3.0/crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch @@ -0,0 +1,34 @@ +From b2bac6acf86d05d8af0499f37d91ecac15722803 Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Fri, 19 Aug 2011 16:11:23 +0800 +Subject: crypto: cryptd - Use subsys_initcall to prevent races with aesni + +From: Herbert Xu + +commit b2bac6acf86d05d8af0499f37d91ecac15722803 upstream. + +As cryptd is depeneded on by other algorithms such as aesni-intel, +it needs to be registered before them. When everything is built +as modules, this occurs naturally. However, for this to work when +they are built-in, we need to use subsys_initcall in cryptd. + +Tested-by: Josh Boyer +Signed-off-by: Herbert Xu +Cc: Kerin Millar +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/cryptd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/crypto/cryptd.c ++++ b/crypto/cryptd.c +@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void) + crypto_unregister_template(&cryptd_tmpl); + } + +-module_init(cryptd_init); ++subsys_initcall(cryptd_init); + module_exit(cryptd_exit); + + MODULE_LICENSE("GPL"); diff --git a/queue-3.0/net-align-af-specific-flowi-structs-to-long.patch b/queue-3.0/net-align-af-specific-flowi-structs-to-long.patch new file mode 100644 index 00000000000..544c06f5725 --- /dev/null +++ b/queue-3.0/net-align-af-specific-flowi-structs-to-long.patch @@ -0,0 +1,50 @@ +From 728871bc05afc8ff310b17dba3e57a2472792b13 Mon Sep 17 00:00:00 2001 +From: David Ward +Date: Mon, 5 Sep 2011 16:47:23 +0000 +Subject: net: Align AF-specific flowi structs to long + +From: David Ward + +commit 728871bc05afc8ff310b17dba3e57a2472792b13 upstream. + +AF-specific flowi structs are now passed to flow_key_compare, which must +also be aligned to a long. + +Signed-off-by: David Ward +Signed-off-by: David S. Miller +Cc: Kim Phillips +Signed-off-by: Greg Kroah-Hartman + +--- + include/net/flow.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -68,7 +68,7 @@ struct flowi4 { + #define fl4_ipsec_spi uli.spi + #define fl4_mh_type uli.mht.type + #define fl4_gre_key uli.gre_key +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + static inline void flowi4_init_output(struct flowi4 *fl4, int oif, + __u32 mark, __u8 tos, __u8 scope, +@@ -112,7 +112,7 @@ struct flowi6 { + #define fl6_ipsec_spi uli.spi + #define fl6_mh_type uli.mht.type + #define fl6_gre_key uli.gre_key +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + struct flowidn { + struct flowi_common __fl_common; +@@ -127,7 +127,7 @@ struct flowidn { + union flowi_uli uli; + #define fld_sport uli.ports.sport + #define fld_dport uli.ports.dport +-}; ++} __attribute__((__aligned__(BITS_PER_LONG/8))); + + struct flowi { + union { diff --git a/queue-3.0/net-handle-different-key-sizes-between-address-families-in-flow-cache.patch b/queue-3.0/net-handle-different-key-sizes-between-address-families-in-flow-cache.patch new file mode 100644 index 00000000000..9fe93a1a6b9 --- /dev/null +++ b/queue-3.0/net-handle-different-key-sizes-between-address-families-in-flow-cache.patch @@ -0,0 +1,140 @@ +From aa1c366e4febc7f5c2b84958a2dd7cd70e28f9d0 Mon Sep 17 00:00:00 2001 +From: dpward +Date: Mon, 5 Sep 2011 16:47:24 +0000 +Subject: net: Handle different key sizes between address families in flow cache + +From: dpward + +commit aa1c366e4febc7f5c2b84958a2dd7cd70e28f9d0 upstream. + +With the conversion of struct flowi to a union of AF-specific structs, some +operations on the flow cache need to account for the exact size of the key. + +Signed-off-by: David Ward +Signed-off-by: David S. Miller +Cc: Kim Phillips +Signed-off-by: Greg Kroah-Hartman + +--- + include/net/flow.h | 19 +++++++++++++++++++ + net/core/flow.c | 31 +++++++++++++++++-------------- + 2 files changed, 36 insertions(+), 14 deletions(-) + +--- a/include/net/flow.h ++++ b/include/net/flow.h +@@ -7,6 +7,7 @@ + #ifndef _NET_FLOW_H + #define _NET_FLOW_H + ++#include + #include + #include + +@@ -161,6 +162,24 @@ static inline struct flowi *flowidn_to_f + return container_of(fldn, struct flowi, u.dn); + } + ++typedef unsigned long flow_compare_t; ++ ++static inline size_t flow_key_size(u16 family) ++{ ++ switch (family) { ++ case AF_INET: ++ BUILD_BUG_ON(sizeof(struct flowi4) % sizeof(flow_compare_t)); ++ return sizeof(struct flowi4) / sizeof(flow_compare_t); ++ case AF_INET6: ++ BUILD_BUG_ON(sizeof(struct flowi6) % sizeof(flow_compare_t)); ++ return sizeof(struct flowi6) / sizeof(flow_compare_t); ++ case AF_DECnet: ++ BUILD_BUG_ON(sizeof(struct flowidn) % sizeof(flow_compare_t)); ++ return sizeof(struct flowidn) / sizeof(flow_compare_t); ++ } ++ return 0; ++} ++ + #define FLOW_DIR_IN 0 + #define FLOW_DIR_OUT 1 + #define FLOW_DIR_FWD 2 +--- a/net/core/flow.c ++++ b/net/core/flow.c +@@ -172,29 +172,26 @@ static void flow_new_hash_rnd(struct flo + + static u32 flow_hash_code(struct flow_cache *fc, + struct flow_cache_percpu *fcp, +- const struct flowi *key) ++ const struct flowi *key, ++ size_t keysize) + { + const u32 *k = (const u32 *) key; ++ const u32 length = keysize * sizeof(flow_compare_t) / sizeof(u32); + +- return jhash2(k, (sizeof(*key) / sizeof(u32)), fcp->hash_rnd) ++ return jhash2(k, length, fcp->hash_rnd) + & (flow_cache_hash_size(fc) - 1); + } + +-typedef unsigned long flow_compare_t; +- + /* I hear what you're saying, use memcmp. But memcmp cannot make +- * important assumptions that we can here, such as alignment and +- * constant size. ++ * important assumptions that we can here, such as alignment. + */ +-static int flow_key_compare(const struct flowi *key1, const struct flowi *key2) ++static int flow_key_compare(const struct flowi *key1, const struct flowi *key2, ++ size_t keysize) + { + const flow_compare_t *k1, *k1_lim, *k2; +- const int n_elem = sizeof(struct flowi) / sizeof(flow_compare_t); +- +- BUILD_BUG_ON(sizeof(struct flowi) % sizeof(flow_compare_t)); + + k1 = (const flow_compare_t *) key1; +- k1_lim = k1 + n_elem; ++ k1_lim = k1 + keysize; + + k2 = (const flow_compare_t *) key2; + +@@ -215,6 +212,7 @@ flow_cache_lookup(struct net *net, const + struct flow_cache_entry *fle, *tfle; + struct hlist_node *entry; + struct flow_cache_object *flo; ++ size_t keysize; + unsigned int hash; + + local_bh_disable(); +@@ -222,6 +220,11 @@ flow_cache_lookup(struct net *net, const + + fle = NULL; + flo = NULL; ++ ++ keysize = flow_key_size(family); ++ if (!keysize) ++ goto nocache; ++ + /* Packet really early in init? Making flow_cache_init a + * pre-smp initcall would solve this. --RR */ + if (!fcp->hash_table) +@@ -230,11 +233,11 @@ flow_cache_lookup(struct net *net, const + if (fcp->hash_rnd_recalc) + flow_new_hash_rnd(fc, fcp); + +- hash = flow_hash_code(fc, fcp, key); ++ hash = flow_hash_code(fc, fcp, key, keysize); + hlist_for_each_entry(tfle, entry, &fcp->hash_table[hash], u.hlist) { + if (tfle->family == family && + tfle->dir == dir && +- flow_key_compare(key, &tfle->key) == 0) { ++ flow_key_compare(key, &tfle->key, keysize) == 0) { + fle = tfle; + break; + } +@@ -248,7 +251,7 @@ flow_cache_lookup(struct net *net, const + if (fle) { + fle->family = family; + fle->dir = dir; +- memcpy(&fle->key, key, sizeof(*key)); ++ memcpy(&fle->key, key, keysize * sizeof(flow_compare_t)); + fle->object = NULL; + hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]); + fcp->hash_count++; diff --git a/queue-3.0/pm-suspend-off-by-one-in-pm_suspend.patch b/queue-3.0/pm-suspend-off-by-one-in-pm_suspend.patch new file mode 100644 index 00000000000..d4dc425b5e3 --- /dev/null +++ b/queue-3.0/pm-suspend-off-by-one-in-pm_suspend.patch @@ -0,0 +1,33 @@ +From 528f7ce6e439edeac38f6b3f8561f1be129b5e91 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 21 Sep 2011 20:55:04 +0200 +Subject: PM / Suspend: Off by one in pm_suspend() + +From: Dan Carpenter + +commit 528f7ce6e439edeac38f6b3f8561f1be129b5e91 upstream. + +In enter_state() we use "state" as an offset for the pm_states[] +array. The pm_states[] array only has PM_SUSPEND_MAX elements so +this test is off by one. + +Signed-off-by: Dan Carpenter +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + + +--- + kernel/power/suspend.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/power/suspend.c ++++ b/kernel/power/suspend.c +@@ -307,7 +307,7 @@ int enter_state(suspend_state_t state) + */ + int pm_suspend(suspend_state_t state) + { +- if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) ++ if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) + return enter_state(state); + return -EINVAL; + } diff --git a/queue-3.0/series b/queue-3.0/series index 96e00a0a92b..d18db1d4818 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -244,3 +244,7 @@ mtd-provide-an-alias-for-the-redboot-module-name.patch mtd-pxa3xx_nand-fix-nand-detection-issue.patch mtd-pxa3xx_nand-fix-blank-page-ecc-mismatch.patch ext4-remove-i_mutex-lock-in-ext4_evict_inode-to-fix-lockdep-complaining.patch +net-align-af-specific-flowi-structs-to-long.patch +net-handle-different-key-sizes-between-address-families-in-flow-cache.patch +pm-suspend-off-by-one-in-pm_suspend.patch +crypto-cryptd-use-subsys_initcall-to-prevent-races-with-aesni.patch -- 2.47.3