lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 02 Mar 2018 10:52:08 -0500 From: Roman Mashak <mrv@...atatu.com> To: Marcelo Ricardo Leitner <marcelo.leitner@...il.com> Cc: davem@...emloft.net, netdev@...r.kernel.org, jhs@...atatu.com, jiri@...nulli.us, xiyou.wangcong@...il.com Subject: Re: [PATCH 4/5] net sched actions: implement get_fill_size routine in act_gact Marcelo Ricardo Leitner <marcelo.leitner@...il.com> writes: > On Thu, Mar 01, 2018 at 01:45:30PM -0500, Roman Mashak wrote: >> Signed-off-by: Roman Mashak <mrv@...atatu.com> >> --- >> net/sched/act_gact.c | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c >> index 7456325..ee775ac 100644 >> --- a/net/sched/act_gact.c >> +++ b/net/sched/act_gact.c >> @@ -217,6 +217,22 @@ static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index, >> return tcf_idr_search(tn, a, index); >> } >> >> +static size_t tcf_gact_get_fill_size(const struct tc_action *act) >> +{ >> +#ifdef CONFIG_GACT_PROB >> + struct tcf_gact *gact = to_gact(act); >> + int prob_len = 0; >> + >> + if (gact->tcfg_ptype) >> + prob_len = nla_total_size(sizeof(struct tc_gact_p)); >> +#endif >> + return nla_total_size(sizeof(struct tc_gact)) /* TCA_GACT_PARMS */ >> +#ifdef CONFIG_GACT_PROB >> + + prob_len /* TCA_GACT_PROB */ >> +#endif >> + ; >> +} > > This is quite bad to the eye. What about: > > static size_t tcf_gact_get_fill_size(const struct tc_action *act) > { > size_t sz = nla_total_size(sizeof(struct tc_gact)); /* TCA_GACT_PARMS */ > > #ifdef CONFIG_GACT_PROB > if (to_gact(act)->tcfg_ptype) > sz += nla_total_size(sizeof(struct tc_gact_p)); /* TCA_GACT_PROB */ > #endif > > return sz; > } > > Should be the same, bug easier to read. Agree, I will send v2.
Powered by blists - more mailing lists