From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
Chengwen Feng <fengchengwen@huawei.com>,
Kevin Laatz <kevin.laatz@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>
Cc: <lihuisong@huawei.com>, <haijie1@huawei.com>
Subject: [PATCH 4/4] dmadev: clean code for verify parameter
Date: Thu, 5 Sep 2024 14:46:38 +0800 [thread overview]
Message-ID: <20240905064638.17980-5-haijie1@huawei.com> (raw)
In-Reply-To: <20240905064638.17980-1-haijie1@huawei.com>
From: Chengwen Feng <fengchengwen@huawei.com>
Make sure to verify the 'dev_id' parameter before using them.
Note: there is no actual problem with the current code, but it is
recommended to clean it up.
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/dmadev/rte_dmadev.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 60c3d8ebf68e..4ba3b9380c5f 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -436,11 +436,12 @@ rte_dma_count_avail(void)
int
rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info)
{
- const struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ const struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id) || dev_info == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (*dev->dev_ops->dev_info_get == NULL)
return -ENOTSUP;
@@ -462,12 +463,13 @@ rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info)
int
rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
struct rte_dma_info dev_info;
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id) || dev_conf == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (dev->data->dev_started != 0) {
RTE_DMA_LOG(ERR,
@@ -513,11 +515,12 @@ rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf)
int
rte_dma_start(int16_t dev_id)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (dev->data->dev_conf.nb_vchans == 0) {
RTE_DMA_LOG(ERR, "Device %d must be configured first", dev_id);
@@ -545,11 +548,12 @@ rte_dma_start(int16_t dev_id)
int
rte_dma_stop(int16_t dev_id)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (dev->data->dev_started == 0) {
RTE_DMA_LOG(WARNING, "Device %d already stopped", dev_id);
@@ -572,11 +576,12 @@ rte_dma_stop(int16_t dev_id)
int
rte_dma_close(int16_t dev_id)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
/* Device must be stopped before it can be closed */
if (dev->data->dev_started == 1) {
@@ -600,13 +605,14 @@ int
rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan,
const struct rte_dma_vchan_conf *conf)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
struct rte_dma_info dev_info;
bool src_is_dev, dst_is_dev;
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id) || conf == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (dev->data->dev_started != 0) {
RTE_DMA_LOG(ERR,
@@ -693,10 +699,11 @@ rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan,
int
rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats)
{
- const struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ const struct rte_dma_dev *dev;
if (!rte_dma_is_valid(dev_id) || stats == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (vchan >= dev->data->dev_conf.nb_vchans &&
vchan != RTE_DMA_ALL_VCHAN) {
@@ -715,11 +722,12 @@ rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats)
int
rte_dma_stats_reset(int16_t dev_id, uint16_t vchan)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ struct rte_dma_dev *dev;
int ret;
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (vchan >= dev->data->dev_conf.nb_vchans &&
vchan != RTE_DMA_ALL_VCHAN) {
@@ -739,10 +747,11 @@ rte_dma_stats_reset(int16_t dev_id, uint16_t vchan)
int
rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status *status)
{
- struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ struct rte_dma_dev *dev;
if (!rte_dma_is_valid(dev_id) || status == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
if (vchan >= dev->data->dev_conf.nb_vchans) {
RTE_DMA_LOG(ERR, "Device %u vchan %u out of range", dev_id, vchan);
@@ -804,12 +813,13 @@ dma_dump_capability(FILE *f, uint64_t dev_capa)
int
rte_dma_dump(int16_t dev_id, FILE *f)
{
- const struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+ const struct rte_dma_dev *dev;
struct rte_dma_info dev_info;
int ret;
if (!rte_dma_is_valid(dev_id) || f == NULL)
return -EINVAL;
+ dev = &rte_dma_devices[dev_id];
ret = rte_dma_info_get(dev_id, &dev_info);
if (ret != 0) {
--
2.22.0
prev parent reply other threads:[~2024-09-05 6:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 6:46 [PATCH 0/4] clean code for dmadev and hns3 Jie Hai
2024-09-05 6:46 ` [PATCH 1/4] ethdev: verify queue ID when Tx done cleanup Jie Hai
2024-09-05 7:33 ` Andrew Rybchenko
2024-09-05 6:46 ` [PATCH 2/4] net/hns3: verify reset type from firmware Jie Hai
2024-09-05 6:46 ` [PATCH 3/4] dmadev: fix potential null pointer access Jie Hai
2024-09-05 6:46 ` Jie Hai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240905064638.17980-5-haijie1@huawei.com \
--to=haijie1@huawei.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=ferruh.yigit@amd.com \
--cc=kevin.laatz@intel.com \
--cc=lihuisong@huawei.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).