* [PATCH] driver/char/tpm: declare internal symbols as static
@ 2012-08-29 4:40 xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w
2012-08-30 15:52 ` Kent Yoder
0 siblings, 1 reply; 5+ messages in thread
From: xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w @ 2012-08-29 4:40 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w,
joseph.cihula-ral2JQCrhuEAvxtiuMwx3w,
gang.wei-ral2JQCrhuEAvxtiuMwx3w,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
debora-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
srajiv-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
m.selhorst-iBygD9l97zzQT0dZR+AlfA,
shpedoikal-Re5JQEeQqe8AvxtiuMwx3w,
linux-security-module-u79uwXL29TY76Z2rM5mHXA,
james.l.morris-QHcLZuEGTsvQT0dZR+AlfA, hpa-YMNOUZJC4hwAvxtiuMwx3w,
linux-api-u79uwXL29TY76Z2rM5mHXA, yoder1-r/Jw6+rmf7HQT0dZR+AlfA,
key-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
fengguang.wu-ral2JQCrhuEAvxtiuMwx3w
From: Xiaoyan Zhang <xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
This patch declares the internal struct and functions as static to provide
more security.
Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Fengguang Wu <fengguang.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/char/tpm/tpm.c | 4 ++--
drivers/char/tpm/tpm_ppi.c | 37 +++++++++++++++++++------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 39526c0..6724615 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -915,7 +915,7 @@ EXPORT_SYMBOL_GPL(tpm_show_pcrs);
#define READ_PUBEK_RESULT_SIZE 314
#define TPM_ORD_READPUBEK cpu_to_be32(124)
-struct tpm_input_header tpm_readpubek_header = {
+static struct tpm_input_header tpm_readpubek_header = {
.tag = TPM_TAG_RQU_COMMAND,
.length = cpu_to_be32(30),
.ordinal = TPM_ORD_READPUBEK
@@ -1395,7 +1395,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
* Once all references to platform device are down to 0,
* release all allocated structures.
*/
-void tpm_dev_release(struct device *dev)
+static void tpm_dev_release(struct device *dev)
{
struct tpm_chip *chip = dev_get_drvdata(dev);
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 440fa1c..f27b58c 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -53,8 +53,8 @@ static inline void ppi_assign_params(union acpi_object params[4],
params[3].package.elements = NULL;
}
-ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_version(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -82,9 +82,8 @@ ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
return status;
}
-ssize_t tpm_show_ppi_request(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_request(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -132,9 +131,9 @@ cleanup:
return status;
}
-ssize_t tpm_store_ppi_request(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t tpm_store_ppi_request(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -207,9 +206,9 @@ ssize_t tpm_store_ppi_request(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_transition_action(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_transition_action(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -269,9 +268,9 @@ ssize_t tpm_show_ppi_transition_action(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_response(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_response(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -413,14 +412,16 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
return str - buf;
}
-ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, 0, PPI_TPM_REQ_MAX);
}
-ssize_t tpm_show_ppi_vs_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_vs_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, PPI_VS_REQ_START, PPI_VS_REQ_END);
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] driver/char/tpm: declare internal symbols as static
2012-08-29 4:40 [PATCH] driver/char/tpm: declare internal symbols as static xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w
@ 2012-08-30 15:52 ` Kent Yoder
[not found] ` <20120830155247.GA4574-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Kent Yoder @ 2012-08-30 15:52 UTC (permalink / raw)
To: xiaoyan.zhang
Cc: linux-kernel, joseph.cihula, gang.wei, tpmdd-devel, m.selhorst,
shpedoikal, linux-security-module, james.l.morris, hpa, linux-api,
fengguang.wu
On Thu, Aug 29, 2013 at 08:39:11PM +0800, xiaoyan.zhang@intel.com wrote:
> From: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
>
> This patch declares the internal struct and functions as static to provide
> more security.
Thanks, this looks good to me. James, can you apply this directly to
security-next?
Kent
Reviewed-by: Kent Yoder <key@linux.vnet.ibm.com>
>
> Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> ---
> drivers/char/tpm/tpm.c | 4 ++--
> drivers/char/tpm/tpm_ppi.c | 37 +++++++++++++++++++------------------
> 2 files changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
> index 39526c0..6724615 100644
> --- a/drivers/char/tpm/tpm.c
> +++ b/drivers/char/tpm/tpm.c
> @@ -915,7 +915,7 @@ EXPORT_SYMBOL_GPL(tpm_show_pcrs);
>
> #define READ_PUBEK_RESULT_SIZE 314
> #define TPM_ORD_READPUBEK cpu_to_be32(124)
> -struct tpm_input_header tpm_readpubek_header = {
> +static struct tpm_input_header tpm_readpubek_header = {
> .tag = TPM_TAG_RQU_COMMAND,
> .length = cpu_to_be32(30),
> .ordinal = TPM_ORD_READPUBEK
> @@ -1395,7 +1395,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
> * Once all references to platform device are down to 0,
> * release all allocated structures.
> */
> -void tpm_dev_release(struct device *dev)
> +static void tpm_dev_release(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
>
> diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
> index 440fa1c..f27b58c 100644
> --- a/drivers/char/tpm/tpm_ppi.c
> +++ b/drivers/char/tpm/tpm_ppi.c
> @@ -53,8 +53,8 @@ static inline void ppi_assign_params(union acpi_object params[4],
> params[3].package.elements = NULL;
> }
>
> -ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
> - char *buf)
> +static ssize_t tpm_show_ppi_version(struct device *dev,
> + struct device_attribute *attr, char *buf)
> {
> acpi_handle handle;
> acpi_status status;
> @@ -82,9 +82,8 @@ ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
> return status;
> }
>
> -ssize_t tpm_show_ppi_request(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> +static ssize_t tpm_show_ppi_request(struct device *dev,
> + struct device_attribute *attr, char *buf)
> {
> acpi_handle handle;
> acpi_status status;
> @@ -132,9 +131,9 @@ cleanup:
> return status;
> }
>
> -ssize_t tpm_store_ppi_request(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf, size_t count)
> +static ssize_t tpm_store_ppi_request(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> {
> char version[PPI_VERSION_LEN + 1];
> acpi_handle handle;
> @@ -207,9 +206,9 @@ ssize_t tpm_store_ppi_request(struct device *dev,
> return status;
> }
>
> -ssize_t tpm_show_ppi_transition_action(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> +static ssize_t tpm_show_ppi_transition_action(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> {
> char version[PPI_VERSION_LEN + 1];
> acpi_handle handle;
> @@ -269,9 +268,9 @@ ssize_t tpm_show_ppi_transition_action(struct device *dev,
> return status;
> }
>
> -ssize_t tpm_show_ppi_response(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> +static ssize_t tpm_show_ppi_response(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> {
> acpi_handle handle;
> acpi_status status;
> @@ -413,14 +412,16 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
> return str - buf;
> }
>
> -ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
> - struct device_attribute *attr, char *buf)
> +static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> {
> return show_ppi_operations(buf, 0, PPI_TPM_REQ_MAX);
> }
>
> -ssize_t tpm_show_ppi_vs_operations(struct device *dev,
> - struct device_attribute *attr, char *buf)
> +static ssize_t tpm_show_ppi_vs_operations(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> {
> return show_ppi_operations(buf, PPI_VS_REQ_START, PPI_VS_REQ_END);
> }
> --
> 1.7.7.6
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] driver/char/tpm: declare internal symbols as static
@ 2012-08-29 4:40 xiaoyan.zhang
0 siblings, 0 replies; 5+ messages in thread
From: xiaoyan.zhang @ 2012-08-29 4:40 UTC (permalink / raw)
To: linux-kernel
Cc: xiaoyan.zhang, joseph.cihula, gang.wei, tpmdd-devel, debora,
srajiv, m.selhorst, shpedoikal, linux-security-module,
james.l.morris, hpa, linux-api, yoder1, key, fengguang.wu
From: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
This patch declares the internal struct and functions as static to provide
more security.
Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
drivers/char/tpm/tpm.c | 4 ++--
drivers/char/tpm/tpm_ppi.c | 37 +++++++++++++++++++------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 39526c0..6724615 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -915,7 +915,7 @@ EXPORT_SYMBOL_GPL(tpm_show_pcrs);
#define READ_PUBEK_RESULT_SIZE 314
#define TPM_ORD_READPUBEK cpu_to_be32(124)
-struct tpm_input_header tpm_readpubek_header = {
+static struct tpm_input_header tpm_readpubek_header = {
.tag = TPM_TAG_RQU_COMMAND,
.length = cpu_to_be32(30),
.ordinal = TPM_ORD_READPUBEK
@@ -1395,7 +1395,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
* Once all references to platform device are down to 0,
* release all allocated structures.
*/
-void tpm_dev_release(struct device *dev)
+static void tpm_dev_release(struct device *dev)
{
struct tpm_chip *chip = dev_get_drvdata(dev);
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 440fa1c..f27b58c 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -53,8 +53,8 @@ static inline void ppi_assign_params(union acpi_object params[4],
params[3].package.elements = NULL;
}
-ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_version(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -82,9 +82,8 @@ ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
return status;
}
-ssize_t tpm_show_ppi_request(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_request(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -132,9 +131,9 @@ cleanup:
return status;
}
-ssize_t tpm_store_ppi_request(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t tpm_store_ppi_request(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -207,9 +206,9 @@ ssize_t tpm_store_ppi_request(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_transition_action(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_transition_action(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -269,9 +268,9 @@ ssize_t tpm_show_ppi_transition_action(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_response(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_response(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -413,14 +412,16 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
return str - buf;
}
-ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, 0, PPI_TPM_REQ_MAX);
}
-ssize_t tpm_show_ppi_vs_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_vs_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, PPI_VS_REQ_START, PPI_VS_REQ_END);
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] driver/char/tpm: declare internal symbols as static
@ 2012-08-29 4:40 xiaoyan.zhang
0 siblings, 0 replies; 5+ messages in thread
From: xiaoyan.zhang @ 2012-08-29 4:40 UTC (permalink / raw)
To: linux-kernel
Cc: xiaoyan.zhang, joseph.cihula, gang.wei, tpmdd-devel, debora,
srajiv, m.selhorst, shpedoikal, linux-security-module,
james.l.morris, hpa, linux-api, yoder1, key, fengguang.wu
From: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
This patch declares the internal struct and functions as static to provide
more security.
Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
drivers/char/tpm/tpm.c | 4 ++--
drivers/char/tpm/tpm_ppi.c | 37 +++++++++++++++++++------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 39526c0..6724615 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -915,7 +915,7 @@ EXPORT_SYMBOL_GPL(tpm_show_pcrs);
#define READ_PUBEK_RESULT_SIZE 314
#define TPM_ORD_READPUBEK cpu_to_be32(124)
-struct tpm_input_header tpm_readpubek_header = {
+static struct tpm_input_header tpm_readpubek_header = {
.tag = TPM_TAG_RQU_COMMAND,
.length = cpu_to_be32(30),
.ordinal = TPM_ORD_READPUBEK
@@ -1395,7 +1395,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
* Once all references to platform device are down to 0,
* release all allocated structures.
*/
-void tpm_dev_release(struct device *dev)
+static void tpm_dev_release(struct device *dev)
{
struct tpm_chip *chip = dev_get_drvdata(dev);
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index 440fa1c..f27b58c 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -53,8 +53,8 @@ static inline void ppi_assign_params(union acpi_object params[4],
params[3].package.elements = NULL;
}
-ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_version(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -82,9 +82,8 @@ ssize_t tpm_show_ppi_version(struct device *dev, struct device_attribute *attr,
return status;
}
-ssize_t tpm_show_ppi_request(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_request(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -132,9 +131,9 @@ cleanup:
return status;
}
-ssize_t tpm_store_ppi_request(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t tpm_store_ppi_request(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -207,9 +206,9 @@ ssize_t tpm_store_ppi_request(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_transition_action(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_transition_action(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
@@ -269,9 +268,9 @@ ssize_t tpm_show_ppi_transition_action(struct device *dev,
return status;
}
-ssize_t tpm_show_ppi_response(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t tpm_show_ppi_response(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
acpi_handle handle;
acpi_status status;
@@ -413,14 +412,16 @@ static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
return str - buf;
}
-ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_tcg_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, 0, PPI_TPM_REQ_MAX);
}
-ssize_t tpm_show_ppi_vs_operations(struct device *dev,
- struct device_attribute *attr, char *buf)
+static ssize_t tpm_show_ppi_vs_operations(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return show_ppi_operations(buf, PPI_VS_REQ_START, PPI_VS_REQ_END);
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-05 0:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-29 4:40 [PATCH] driver/char/tpm: declare internal symbols as static xiaoyan.zhang-ral2JQCrhuEAvxtiuMwx3w
2012-08-30 15:52 ` Kent Yoder
[not found] ` <20120830155247.GA4574-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-09-05 0:21 ` James Morris
-- strict thread matches above, loose matches on Subject: below --
2012-08-29 4:40 xiaoyan.zhang
2012-08-29 4:40 xiaoyan.zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).