* [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init @ 2018-11-12 9:25 Wei Zhao 2018-11-13 22:40 ` Zhang, Qi Z 2018-11-13 23:11 ` Ferruh Yigit 0 siblings, 2 replies; 4+ messages in thread From: Wei Zhao @ 2018-11-12 9:25 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, stable, yuan.peng, Wei Zhao There need an parameter check for RSS flow init, or it may cause core dump if pointer is NULL in memory copy. Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 1c77906..217a8dc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12552,13 +12552,16 @@ i40e_rss_conf_init(struct i40e_rte_flow_rss_conf *out, if (in->key_len > RTE_DIM(out->key) || in->queue_num > RTE_DIM(out->queue)) return -EINVAL; + if (!in->key && in->key_len) + return -EINVAL; + if (out->key && in->key) + out->conf.key = memcpy(out->key, in->key, in->key_len); out->conf = (struct rte_flow_action_rss){ .func = in->func, .level = in->level, .types = in->types, .key_len = in->key_len, .queue_num = in->queue_num, - .key = memcpy(out->key, in->key, in->key_len), .queue = memcpy(out->queue, in->queue, sizeof(*in->queue) * in->queue_num), }; -- 2.7.5 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init 2018-11-12 9:25 [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init Wei Zhao @ 2018-11-13 22:40 ` Zhang, Qi Z 2018-11-13 23:11 ` Ferruh Yigit 1 sibling, 0 replies; 4+ messages in thread From: Zhang, Qi Z @ 2018-11-13 22:40 UTC (permalink / raw) To: Zhao1, Wei, dev; +Cc: stable, Peng, Yuan > -----Original Message----- > From: Zhao1, Wei > Sent: Monday, November 12, 2018 1:25 AM > To: dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org; Peng, Yuan > <yuan.peng@intel.com>; Zhao1, Wei <wei.zhao1@intel.com> > Subject: [PATCH] net/i40e: add parameter check for RSS flow init > > There need an parameter check for RSS flow init, or it may cause core dump > if pointer is NULL in memory copy. > > Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> Acked-by: Qi Zhang <qi.z.zhang@intel.com> Applied to dpdk-next-net-net. Thanks Qi > --- > drivers/net/i40e/i40e_ethdev.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c > index 1c77906..217a8dc 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -12552,13 +12552,16 @@ i40e_rss_conf_init(struct > i40e_rte_flow_rss_conf *out, > if (in->key_len > RTE_DIM(out->key) || > in->queue_num > RTE_DIM(out->queue)) > return -EINVAL; > + if (!in->key && in->key_len) > + return -EINVAL; > + if (out->key && in->key) > + out->conf.key = memcpy(out->key, in->key, in->key_len); > out->conf = (struct rte_flow_action_rss){ > .func = in->func, > .level = in->level, > .types = in->types, > .key_len = in->key_len, > .queue_num = in->queue_num, > - .key = memcpy(out->key, in->key, in->key_len), > .queue = memcpy(out->queue, in->queue, > sizeof(*in->queue) * in->queue_num), > }; > -- > 2.7.5 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init 2018-11-12 9:25 [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init Wei Zhao 2018-11-13 22:40 ` Zhang, Qi Z @ 2018-11-13 23:11 ` Ferruh Yigit 2018-11-14 4:12 ` Zhao1, Wei 1 sibling, 1 reply; 4+ messages in thread From: Ferruh Yigit @ 2018-11-13 23:11 UTC (permalink / raw) To: Wei Zhao, dev; +Cc: qi.z.zhang, stable, yuan.peng On 11/12/2018 9:25 AM, Wei Zhao wrote: > There need an parameter check for RSS flow init, or it may cause > core dump if pointer is NULL in memory copy. > > Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > --- > drivers/net/i40e/i40e_ethdev.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c > index 1c77906..217a8dc 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -12552,13 +12552,16 @@ i40e_rss_conf_init(struct i40e_rte_flow_rss_conf *out, > if (in->key_len > RTE_DIM(out->key) || > in->queue_num > RTE_DIM(out->queue)) > return -EINVAL; > + if (!in->key && in->key_len) > + return -EINVAL; > + if (out->key && in->key) > + out->conf.key = memcpy(out->key, in->key, in->key_len); Giving following warning [1] with clang, which looks like valid warning. i40e_rte_flow_rss_conf->key is an array, no need to check its address. I will remove it while merging. [1] .../drivers/net/i40e/i40e_ethdev.c:12557:11: error: address of array 'out->key' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] if (out->key && in->key) ~~~~~^~~ ~~ > out->conf = (struct rte_flow_action_rss){ > .func = in->func, > .level = in->level, > .types = in->types, > .key_len = in->key_len, > .queue_num = in->queue_num, > - .key = memcpy(out->key, in->key, in->key_len), > .queue = memcpy(out->queue, in->queue, > sizeof(*in->queue) * in->queue_num), > }; > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init 2018-11-13 23:11 ` Ferruh Yigit @ 2018-11-14 4:12 ` Zhao1, Wei 0 siblings, 0 replies; 4+ messages in thread From: Zhao1, Wei @ 2018-11-14 4:12 UTC (permalink / raw) To: Yigit, Ferruh, dev; +Cc: Zhang, Qi Z, stable, Peng, Yuan > -----Original Message----- > From: Yigit, Ferruh > Sent: Wednesday, November 14, 2018 7:11 AM > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org; Peng, Yuan > <yuan.peng@intel.com> > Subject: Re: [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS > flow init > > On 11/12/2018 9:25 AM, Wei Zhao wrote: > > There need an parameter check for RSS flow init, or it may cause core > > dump if pointer is NULL in memory copy. > > > > Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") > > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > > --- > > drivers/net/i40e/i40e_ethdev.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > b/drivers/net/i40e/i40e_ethdev.c index 1c77906..217a8dc 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -12552,13 +12552,16 @@ i40e_rss_conf_init(struct > i40e_rte_flow_rss_conf *out, > > if (in->key_len > RTE_DIM(out->key) || > > in->queue_num > RTE_DIM(out->queue)) > > return -EINVAL; > > + if (!in->key && in->key_len) > > + return -EINVAL; > > + if (out->key && in->key) > > + out->conf.key = memcpy(out->key, in->key, in->key_len); > > Giving following warning [1] with clang, which looks like valid warning. > i40e_rte_flow_rss_conf->key is an array, no need to check its address. Yes, you are right, thanks. > > I will remove it while merging. > > [1] > .../drivers/net/i40e/i40e_ethdev.c:12557:11: error: address of array 'out- > >key' > will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] > > > if (out->key && in->key) > ~~~~~^~~ ~~ > > > out->conf = (struct rte_flow_action_rss){ > > .func = in->func, > > .level = in->level, > > .types = in->types, > > .key_len = in->key_len, > > .queue_num = in->queue_num, > > - .key = memcpy(out->key, in->key, in->key_len), > > .queue = memcpy(out->queue, in->queue, > > sizeof(*in->queue) * in->queue_num), > > }; > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-14 4:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-11-12 9:25 [dpdk-stable] [PATCH] net/i40e: add parameter check for RSS flow init Wei Zhao 2018-11-13 22:40 ` Zhang, Qi Z 2018-11-13 23:11 ` Ferruh Yigit 2018-11-14 4:12 ` Zhao1, Wei
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).