Constify struct lib80211_crypto_ops
Subsystems (6)
v2 cover Constify struct lib80211_crypto_ops
This serie constify struct lib80211_crypto_ops. This sutructure is mostly some function pointers, so having it in a read-only section when possible is safer.
The 1st patch, update some function prototypes and data structures in lib80211.
The 2nd patch constifies some struct lib80211_crypto_ops in lib80211. This moves some data to a read-only section, so increase overall security.
The 3rd patch does the same for staging/rtl8192e.
Note that the functions have looked in staging/rtl8192e look really similar to the ones in lib80211. Maybe it could be removed in favor of the latter.
Each patch in the serie has been compile tested only.
Changes in v2:
- patch 1: Update ipw2x00/libipw_wx.c as well [Simon Horman]
- patch 2, 3 : no changes
Christophe JAILLET (3):
lib80211: Handle const struct lib80211_crypto_ops in lib80211
lib80211: Constify struct lib80211_crypto_ops
staging: rtl8192e: Constify struct lib80211_crypto_ops
drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 2 +- drivers/staging/rtl8192e/rtllib_wx.c | 2 +- include/net/lib80211.h | 8 ++++---- net/wireless/lib80211.c | 10 +++++----- net/wireless/lib80211_crypt_ccmp.c | 2 +- net/wireless/lib80211_crypt_tkip.c | 2 +- net/wireless/lib80211_crypt_wep.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-)
Signature · 1 line
2.45.2
PATCH v2 1/3 lib80211: Handle const struct lib80211_crypto_ops in lib80211
lib80211_register_crypto_ops() and lib80211_unregister_crypto_ops() don't modify their "struct lib80211_crypto_ops *ops" argument. So, it can be declared as const.
Doing so, some adjustments are needed to also constify some date in "struct lib80211_crypt_data", "struct lib80211_crypto_alg" and the return value of lib80211_get_crypto_ops().
---
Compile tested only.
Changes in v2:
- Update ipw2x00/libipw_wx.c as well [Simon Horman]
--- drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 2 +- drivers/staging/rtl8192e/rtllib_wx.c | 2 +- include/net/lib80211.h | 8 ++++---- net/wireless/lib80211.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/wireless/intel/ipw2x00/libipw_wx.c +1 -1
@@ -509,7 +509,7 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee,int i, idx, ret =0 ;int group_key =0 ;const char *alg, *module; -struct lib80211_crypto_ops *ops; +const struct lib80211_crypto_ops *ops;struct lib80211_crypt_data **crypt;struct libipw_security sec = {
drivers/staging/rtl8192e/rtllib_wx.c +1 -1
@@ -474,7 +474,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,int i, idx;int group_key =0 ;const char *alg, *module; -struct lib80211_crypto_ops *ops; +const struct lib80211_crypto_ops *ops;struct lib80211_crypt_data **crypt;struct rtllib_security sec = {
include/net/lib80211.h +4 -4
@@ -92,7 +92,7 @@ struct lib80211_crypto_ops {struct lib80211_crypt_data {struct list_head list;/* delayed deletion list */ -struct lib80211_crypto_ops *ops; +const struct lib80211_crypto_ops *ops;void *priv;atomic_t refcnt; };
@@ -113,9 +113,9 @@ struct lib80211_crypt_info {int lib80211_crypt_info_init (struct lib80211_crypt_info *info,char *name,spinlock_t *lock);void lib80211_crypt_info_free (struct lib80211_crypt_info *info); -int lib80211_register_crypto_ops (struct lib80211_crypto_ops *ops); -int lib80211_unregister_crypto_ops (struct lib80211_crypto_ops *ops); -struct lib80211_crypto_ops *lib80211_get_crypto_ops (const char *name); +int lib80211_register_crypto_ops (const struct lib80211_crypto_ops *ops); +int lib80211_unregister_crypto_ops (const struct lib80211_crypto_ops *ops); +const struct lib80211_crypto_ops *lib80211_get_crypto_ops (const char *name);void lib80211_crypt_delayed_deinit (struct lib80211_crypt_info *info,struct lib80211_crypt_data **crypt);
net/wireless/lib80211.c +4 -4
@@ -34,7 +34,7 @@ MODULE_LICENSE("GPL");struct lib80211_crypto_alg {struct list_head list; -struct lib80211_crypto_ops *ops; +const struct lib80211_crypto_ops *ops; };static LIST_HEAD (lib80211_crypto_algs);
@@ -161,7 +161,7 @@ void lib80211_crypt_delayed_deinit(struct lib80211_crypt_info *info, }EXPORT_SYMBOL (lib80211_crypt_delayed_deinit); -int lib80211_register_crypto_ops (struct lib80211_crypto_ops *ops) +int lib80211_register_crypto_ops (const struct lib80211_crypto_ops *ops) {unsigned long flags;struct lib80211_crypto_alg *alg;
@@ -183,7 +183,7 @@ int lib80211_register_crypto_ops(struct lib80211_crypto_ops *ops) }EXPORT_SYMBOL (lib80211_register_crypto_ops); -int lib80211_unregister_crypto_ops (struct lib80211_crypto_ops *ops) +int lib80211_unregister_crypto_ops (const struct lib80211_crypto_ops *ops) {struct lib80211_crypto_alg *alg;unsigned long flags;
@@ -206,7 +206,7 @@ int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops) }EXPORT_SYMBOL (lib80211_unregister_crypto_ops); -struct lib80211_crypto_ops *lib80211_get_crypto_ops (const char *name) +const struct lib80211_crypto_ops *lib80211_get_crypto_ops (const char *name) {struct lib80211_crypto_alg *alg;unsigned long flags;
Signature · 1 line
2.45.2
Re: [PATCH v2 1/3] lib80211: Handle const struct lib80211_crypto_ops in lib80211
Quoted 8 lines · Christophe JAILLET
lib80211_register_crypto_ops()andlib80211_unregister_crypto_ops()don't modify their "structlib80211_crypto_ops*ops" argument. So, it can be declared as const.Doing so, some adjustments are needed to also constify some date in "struct
lib80211_crypt_data", "structlib80211_crypto_alg" and the return value oflib80211_get_crypto_ops().
Quoted 8 lines
Signed-off-by Christophe JAILLET <[email protected]>---
Compile tested only.Changes in v2:
- Updateipw2x00/libipw_wx.cas well [Simon Horman]
PATCH v2 2/3 lib80211: Constify struct lib80211_crypto_ops
In reply to Christophe JAILLETNow that functions in lib80211 handle "const struct lib80211_crypto_ops", some structure can be constified as well.
Constifying these structures moves some data to a read-only section, so increase overall security.
Before:
text data bss dec hex filename
7273 604 16 7893 1ed5 net/wireless/lib80211.o
After:
text data bss dec hex filename
7429 444 16 7889 1ed1 net/wireless/lib80211.o
---
Compile tested only.
Changes in v2
- No changes
--- net/wireless/lib80211.c | 2 +- net/wireless/lib80211_crypt_ccmp.c | 2 +- net/wireless/lib80211_crypt_tkip.c | 2 +- net/wireless/lib80211_crypt_wep.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
net/wireless/lib80211.c +1 -1
@@ -234,7 +234,7 @@ static void lib80211_crypt_null_deinit(void *priv) { } -static struct lib80211_crypto_ops lib80211_crypt_null = { +static const struct lib80211_crypto_ops lib80211_crypt_null = { .name ="NULL" , .init = lib80211_crypt_null_init, .deinit = lib80211_crypt_null_deinit,
net/wireless/lib80211_crypt_ccmp.c +1 -1
@@ -418,7 +418,7 @@ static void lib80211_ccmp_print_stats(struct seq_file *m, void *priv) ccmp->dot11RSNAStatsCCMPDecryptErrors); } -static struct lib80211_crypto_ops lib80211_crypt_ccmp = { +static const struct lib80211_crypto_ops lib80211_crypt_ccmp = { .name ="CCMP" , .init = lib80211_ccmp_init, .deinit = lib80211_ccmp_deinit,
net/wireless/lib80211_crypt_tkip.c +1 -1
@@ -705,7 +705,7 @@ static void lib80211_tkip_print_stats(struct seq_file *m, void *priv) tkip->dot11RSNAStatsTKIPLocalMICFailures); } -static struct lib80211_crypto_ops lib80211_crypt_tkip = { +static const struct lib80211_crypto_ops lib80211_crypt_tkip = { .name ="TKIP" , .init = lib80211_tkip_init, .deinit = lib80211_tkip_deinit,
net/wireless/lib80211_crypt_wep.c +1 -1
@@ -226,7 +226,7 @@ static void lib80211_wep_print_stats(struct seq_file *m, void *priv)seq_printf (m,"key[%d] alg=WEP len=%d\n" , wep->key_idx, wep->key_len); } -static struct lib80211_crypto_ops lib80211_crypt_wep = { +static const struct lib80211_crypto_ops lib80211_crypt_wep = { .name ="WEP" , .init = lib80211_wep_init, .deinit = lib80211_wep_deinit,
Signature · 1 line
2.45.2
Re: [PATCH v2 2/3] lib80211: Constify struct lib80211_crypto_ops
Quoted 10 lines · Christophe JAILLET
Now that functions in lib80211 handle "const struct
lib80211_crypto_ops", some structure can be constified as well.Constifying these structures moves some data to a read-only section, so increase overall security.
Before:
text data bss dec hex filename
7273 604 16 7893 1ed5net/wireless/lib80211.o
Quoted 5 lines
After:
text data bss dec hex filename
7429 444 16 7889 1ed1net/wireless/lib80211.oSigned-off-by Christophe JAILLET <[email protected]>
PATCH v2 3/3 staging: rtl8192e: Constify struct lib80211_crypto_ops
In reply to Christophe JAILLETNow that functions in lib80211 handle "const struct lib80211_crypto_ops", some structure can be constified as well.
Constifying these structures moves some data to a read-only section, so increase overall security.
---
Compile tested only.
Changes in v2:
- No changes
--- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +1 -1
@@ -378,7 +378,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv) ccmp->dot11rsna_stats_ccmp_decrypt_errors); } -static struct lib80211_crypto_ops rtllib_crypt_ccmp = { +static const struct lib80211_crypto_ops rtllib_crypt_ccmp = { .name ="R-CCMP" , .init = rtllib_ccmp_init, .deinit = rtllib_ccmp_deinit,
drivers/staging/rtl8192e/rtllib_crypt_tkip.c +1 -1
@@ -678,7 +678,7 @@ static void rtllib_tkip_print_stats(struct seq_file *m, void *priv) tkip->dot11RSNAStatsTKIPLocalMICFailures); } -static struct lib80211_crypto_ops rtllib_crypt_tkip = { +static const struct lib80211_crypto_ops rtllib_crypt_tkip = { .name ="R-TKIP" , .init = rtllib_tkip_init, .deinit = rtllib_tkip_deinit,
drivers/staging/rtl8192e/rtllib_crypt_wep.c +1 -1
@@ -209,7 +209,7 @@ static void prism2_wep_print_stats(struct seq_file *m, void *priv)seq_printf (m,"key[%d] alg=WEP len=%d\n" , wep->key_idx, wep->key_len); } -static struct lib80211_crypto_ops rtllib_crypt_wep = { +static const struct lib80211_crypto_ops rtllib_crypt_wep = { .name ="R-WEP" , .init = prism2_wep_init, .deinit = prism2_wep_deinit,
Signature · 1 line
2.45.2
Re: [PATCH v2 3/3] staging: rtl8192e: Constify struct lib80211_crypto_ops
Quoted 7 lines · Christophe JAILLET
Now that functions in lib80211 handle "const struct
lib80211_crypto_ops", some structure can be constified as well.Constifying these structures moves some data to a read-only section, so increase overall security.
Signed-off-by Christophe JAILLET <[email protected]>
Re: [PATCH v2 3/3] staging: rtl8192e: Constify struct lib80211_crypto_ops
In reply to Christophe JAILLETQuoted 51 lines · Christophe JAILLET
Now that functions in lib80211 handle "const struct
lib80211_crypto_ops", some structure can be constified as well.Constifying these structures moves some data to a read-only section, so increase overall security.
Signed-off-by Christophe JAILLET <[email protected]>---
Compile tested only.Changes in v2:
- No changes--- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 2 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +1
-1@@ -378,7 +378,7 @@ static void rtllib_ccmp_print_stats(struct seq_file *m, void *priv) ccmp->dot11rsna_stats_ccmp_decrypt_errors); } -static struct lib80211_crypto_ops rtllib_crypt_ccmp = { +static const struct lib80211_crypto_ops rtllib_crypt_ccmp = { .name ="R-CCMP" , .init = rtllib_ccmp_init, .deinit = rtllib_ccmp_deinit,drivers/staging/rtl8192e/rtllib_crypt_tkip.c +1
-1@@ -678,7 +678,7 @@ static void rtllib_tkip_print_stats(struct seq_file *m, void *priv) tkip->dot11RSNAStatsTKIPLocalMICFailures); } -static struct lib80211_crypto_ops rtllib_crypt_tkip = { +static const struct lib80211_crypto_ops rtllib_crypt_tkip = { .name ="R-TKIP" , .init = rtllib_tkip_init, .deinit = rtllib_tkip_deinit,drivers/staging/rtl8192e/rtllib_crypt_wep.c +0
-0
drivers/staging/rtl8192e/rtllib_crypt_wep.c static void prism2_wep_print_stats(struct seq_file *m, void *priv) · line 215
Quoted 8 lines
drivers/staging/rtl8192e/rtllib_crypt_wep.c +1
-1@@ -209,7 +209,7 @@ static void prism2_wep_print_stats(struct seq_file *m, void *priv)seq_printf (m,"key[%d] alg=WEP len=%d\n" , wep->key_idx, wep->key_len); } -static struct lib80211_crypto_ops rtllib_crypt_wep = { +static const struct lib80211_crypto_ops rtllib_crypt_wep = { .name ="R-WEP" , .init = prism2_wep_init, .deinit = prism2_wep_deinit,
Re: [PATCH v2 3/3] staging: rtl8192e: Constify struct lib80211_crypto_ops
In reply to Christophe JAILLETQuoted 9 lines · Christophe JAILLET
Now that functions in lib80211 handle "const struct
lib80211_crypto_ops", some structure can be constified as well.Constifying these structures moves some data to a read-only section, so increase overall security.
Signed-off-by Christophe JAILLET <[email protected]>---
Compile tested only.