expect/conntrack: Avoid spurious covscan overrun warning
Phil Sutter
reviewerPATCH 1/1 expect/conntrack: Avoid spurious covscan overrun warning
It doesn't like how memset() is called for a struct nfnlhdr pointer with large size value. Pass void pointers instead. This also removes the call from __build_{expect,conntrack}() which is duplicate in __build_query_{exp,ct}() code-path.
Signed-off-by Phil Sutter <[email protected]>
--- src/conntrack/api.c | 4 +++- src/conntrack/build.c | 2 -- src/expect/api.c | 4 +++- src/expect/build.c | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-)
src/conntrack/api.c +3 -1
@@ -779,6 +779,8 @@ int nfct_build_conntrack(struct nfnl_subsys_handle *ssh,assert (req !=NULL );assert (ct !=NULL ); +memset (req,0 , size); +return __build_conntrack (ssh, req, size, type, flags, ct); }
@@ -812,7 +814,7 @@ __build_query_ct(struct nfnl_subsys_handle *ssh,assert (data !=NULL );assert (req !=NULL ); -memset (req,0 , size); +memset (buffer,0 , size);switch (qt) {case NFCT_Q_CREATE :
src/conntrack/build.c +0 -2
@@ -27,8 +27,6 @@ int __build_conntrack(struct nfnl_subsys_handle *ssh,return -1 ; } -memset (req,0 , size); - buf = (char *)&req->nlh; nlh =mnl_nlmsg_put_header (buf); nlh->nlmsg_type = (NFNL_SUBSYS_CTNETLINK <<8 ) | type;
src/expect/api.c +3 -1
@@ -513,6 +513,8 @@ int nfexp_build_expect(struct nfnl_subsys_handle *ssh,assert (req !=NULL );assert (exp !=NULL ); +memset (req,0 , size); +return __build_expect (ssh, req, size, type, flags, exp); }
@@ -546,7 +548,7 @@ __build_query_exp(struct nfnl_subsys_handle *ssh,assert (data !=NULL );assert (req !=NULL ); -memset (req,0 , size); +memset (buffer,0 , size);switch (qt) {case NFCT_Q_CREATE :
src/expect/build.c +0 -2
@@ -29,8 +29,6 @@ int __build_expect(struct nfnl_subsys_handle *ssh,else return -1 ; -memset (req,0 , size); - buf = (char *)&req->nlh; nlh =mnl_nlmsg_put_header (buf); nlh->nlmsg_type = (NFNL_SUBSYS_CTNETLINK_EXP <<8 ) | type;
Signature · 1 line
2.34.1
Pablo Neira Ayuso
maintainerQuoted 4 lines · Phil Sutter
It doesn't like how
memset()is called for a struct nfnlhdr pointer with large size value. Pass void pointers instead. This also removes the call from __build_{expect,conntrack}() which is duplicate in __build_query_{exp,ct}() code-path.
LGTM.
Quoted 81 lines
Signed-off-by Phil Sutter <[email protected]>--- src/conntrack/api.c | 4 +++- src/conntrack/build.c | 2 -- src/expect/api.c | 4 +++- src/expect/build.c | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-)src/conntrack/api.c +3
-1@@ -779,6 +779,8 @@ int nfct_build_conntrack(struct nfnl_subsys_handle *ssh,assert (req !=NULL );assert (ct !=NULL ); +memset (req,0 , size); +return __build_conntrack (ssh, req, size, type, flags, ct); }@@ -812,7 +814,7 @@ __build_query_ct(struct nfnl_subsys_handle *ssh,assert (data !=NULL );assert (req !=NULL ); -memset (req,0 , size); +memset (buffer,0 , size);switch (qt) {case NFCT_Q_CREATE :src/conntrack/build.c +0
-2@@ -27,8 +27,6 @@ int __build_conntrack(struct nfnl_subsys_handle *ssh,return -1 ; } -memset (req,0 , size); - buf = (char *)&req->nlh; nlh =mnl_nlmsg_put_header (buf); nlh->nlmsg_type = (NFNL_SUBSYS_CTNETLINK <<8 ) | type;src/expect/api.c +3
-1@@ -513,6 +513,8 @@ int nfexp_build_expect(struct nfnl_subsys_handle *ssh,assert (req !=NULL );assert (exp !=NULL ); +memset (req,0 , size); +return __build_expect (ssh, req, size, type, flags, exp); }@@ -546,7 +548,7 @@ __build_query_exp(struct nfnl_subsys_handle *ssh,assert (data !=NULL );assert (req !=NULL ); -memset (req,0 , size); +memset (buffer,0 , size);switch (qt) {case NFCT_Q_CREATE :src/expect/build.c +0
-2@@ -29,8 +29,6 @@ int __build_expect(struct nfnl_subsys_handle *ssh,else return -1 ; -memset (req,0 , size); - buf = (char *)&req->nlh; nlh =mnl_nlmsg_put_header (buf); nlh->nlmsg_type = (NFNL_SUBSYS_CTNETLINK_EXP <<8 ) | type;Signature · 1 line
2.34.1