diff mbox

[1/1] apparmor: do not expose kernel stack

Message ID 1465594466-16581-1-git-send-email-xypron.glpk@gmx.de (mailing list archive)
State New, archived
Headers show

Commit Message

Heinrich Schuchardt June 10, 2016, 9:34 p.m. UTC
Do not copy uninitalized fields th.td_hilen, th.td_data.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 security/apparmor/match.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

John Johansen June 10, 2016, 10:13 p.m. UTC | #1
On 06/10/2016 02:34 PM, Heinrich Schuchardt wrote:
> Do not copy uninitalized fields th.td_hilen, th.td_data.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Acked-by: John Johansen <john.johansen@canonical.com>

I have a queue of patches I need to push this weekend so I
will suck this one in and send it up with the rest

> ---
>  security/apparmor/match.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/match.c b/security/apparmor/match.c
> index 727eb42..1d6dbd8 100644
> --- a/security/apparmor/match.c
> +++ b/security/apparmor/match.c
> @@ -61,7 +61,9 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
>  
>  	table = kvzalloc(tsize);
>  	if (table) {
> -		*table = th;
> +		table->td_id = th.td_id;
> +		table->td_flags = th.td_flags;
> +		table->td_lolen = th.td_lolen;
>  		if (th.td_flags == YYTD_DATA8)
>  			UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
>  				     u8, byte_to_byte);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 727eb42..1d6dbd8 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -61,7 +61,9 @@  static struct table_header *unpack_table(char *blob, size_t bsize)
 
 	table = kvzalloc(tsize);
 	if (table) {
-		*table = th;
+		table->td_id = th.td_id;
+		table->td_flags = th.td_flags;
+		table->td_lolen = th.td_lolen;
 		if (th.td_flags == YYTD_DATA8)
 			UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
 				     u8, byte_to_byte);