2005-03-19 13:59:26

by Domen Puncer

Subject: [patch 4/4] security/selinux/ss/conditional.c: fix sparse warnings

Signed-off-by: Domen Puncer <[email protected]>
---


kj-domen/security/selinux/ss/conditional.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)

diff -puN security/selinux/ss/conditional.c~sparse-security_selinux_ss_conditional security/selinux/ss/conditional.c
--- kj/security/selinux/ss/conditional.c~sparse-security_selinux_ss_conditional 2005-03-18 20:05:33.000000000 +0100
+++ kj-domen/security/selinux/ss/conditional.c 2005-03-18 20:05:33.000000000 +0100
@@ -219,7 +219,8 @@ int cond_read_bool(struct policydb *p, s
{
char *key = NULL;
struct cond_bool_datum *booldatum;
- u32 buf[3], len;
+ __le32 buf[3];
+ u32 len;
int rc;

booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
@@ -263,7 +264,8 @@ static int cond_read_av_list(struct poli
struct avtab_datum datum;
struct avtab_node *node_ptr;
int rc;
- u32 buf[1], i, len;
+ __le32 buf[1];
+ u32 i, len;
u8 found;

*ret_list = NULL;
@@ -369,7 +371,8 @@ static int expr_isvalid(struct policydb

static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
{
- u32 buf[2], len, i;
+ __le32 buf[2];
+ u32 len, i;
int rc;
struct cond_expr *expr = NULL, *last = NULL;

@@ -427,7 +430,8 @@ err:
int cond_read_list(struct policydb *p, void *fp)
{
struct cond_node *node, *last = NULL;
- u32 buf[1], i, len;
+ __le32 buf[1];
+ u32 i, len;
int rc;

rc = next_entry(buf, fp, sizeof buf);
_

2005-03-20 12:04:06

by Domen Puncer

Subject: Re: [patch 4/4 with proper signed-off] security/selinux/ss/conditional.c: fix sparse warnings

Signed-off-by: Alexey Dobriyan <[email protected]>
Signed-off-by: Domen Puncer <[email protected]>
---


kj-domen/security/selinux/ss/conditional.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)

diff -puN security/selinux/ss/conditional.c~sparse-security_selinux_ss_conditional security/selinux/ss/conditional.c
--- kj/security/selinux/ss/conditional.c~sparse-security_selinux_ss_conditional 2005-03-20 12:11:33.000000000 +0100
+++ kj-domen/security/selinux/ss/conditional.c 2005-03-20 12:11:33.000000000 +0100
@@ -219,7 +219,8 @@ int cond_read_bool(struct policydb *p, s
{
char *key = NULL;
struct cond_bool_datum *booldatum;
- u32 buf[3], len;
+ __le32 buf[3];
+ u32 len;
int rc;

booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
@@ -263,7 +264,8 @@ static int cond_read_av_list(struct poli
struct avtab_datum datum;
struct avtab_node *node_ptr;
int rc;
- u32 buf[1], i, len;
+ __le32 buf[1];
+ u32 i, len;
u8 found;

*ret_list = NULL;
@@ -369,7 +371,8 @@ static int expr_isvalid(struct policydb

static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
{
- u32 buf[2], len, i;
+ __le32 buf[2];
+ u32 len, i;
int rc;
struct cond_expr *expr = NULL, *last = NULL;

@@ -427,7 +430,8 @@ err:
int cond_read_list(struct policydb *p, void *fp)
{
struct cond_node *node, *last = NULL;
- u32 buf[1], i, len;
+ __le32 buf[1];
+ u32 i, len;
int rc;

rc = next_entry(buf, fp, sizeof buf);
_