Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1543492 > unrolled thread
| Started by | Colin King <colin.king@canonical.com> |
|---|---|
| First post | 2016-12-16 15:30 +0100 |
| Last post | 2016-12-22 17:30 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] scsi: qedi: return via va_end to match corresponding va_start Colin King <colin.king@canonical.com> - 2016-12-16 15:30 +0100
Re: [PATCH] scsi: qedi: return via va_end to match corresponding va_start "Rangankar, Manish" <Manish.Rangankar@cavium.com> - 2016-12-22 17:30 +0100
| From | Colin King <colin.king@canonical.com> |
|---|---|
| Date | 2016-12-16 15:30 +0100 |
| Subject | [PATCH] scsi: qedi: return via va_end to match corresponding va_start |
| Message-ID | <sP1Gi-4Ql-17@gated-at.bofh.it> |
From: Colin Ian King <colin.king@canonical.com>
Although on most systems va_end is a no-op, it is good practice
to use va_end on the function return path, especially since the
va_start documenation states:
"Each invocation of va_start() must be matched by a corresponding
invocation of va_end() in the same function."
Found with static analysis by CoverityScan, CIDs 1389477-1389479
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/scsi/qedi/qedi_dbg.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qedi/qedi_dbg.c b/drivers/scsi/qedi/qedi_dbg.c
index 2bdedb9..8fd28b0 100644
--- a/drivers/scsi/qedi/qedi_dbg.c
+++ b/drivers/scsi/qedi/qedi_dbg.c
@@ -52,7 +52,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
vaf.va = &va;
if (!(qedi_dbg_log & QEDI_LOG_WARN))
- return;
+ goto ret;
if (likely(qedi) && likely(qedi->pdev))
pr_warn("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
@@ -60,6 +60,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
else
pr_warn("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+ret:
va_end(va);
}
@@ -80,7 +81,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
vaf.va = &va;
if (!(qedi_dbg_log & QEDI_LOG_NOTICE))
- return;
+ goto ret;
if (likely(qedi) && likely(qedi->pdev))
pr_notice("[%s]:[%s:%d]:%d: %pV",
@@ -89,6 +90,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
else
pr_notice("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+ret:
va_end(va);
}
@@ -109,7 +111,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
vaf.va = &va;
if (!(qedi_dbg_log & level))
- return;
+ goto ret;
if (likely(qedi) && likely(qedi->pdev))
pr_info("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
@@ -117,6 +119,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char *func, u32 line,
else
pr_info("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
+ret:
va_end(va);
}
--
2.10.2
[toc] | [next] | [standalone]
| From | "Rangankar, Manish" <Manish.Rangankar@cavium.com> |
|---|---|
| Date | 2016-12-22 17:30 +0100 |
| Subject | Re: [PATCH] scsi: qedi: return via va_end to match corresponding va_start |
| Message-ID | <sRepH-3kK-15@gated-at.bofh.it> |
| In reply to | #1543492 |
On 16/12/16 7:40 PM, "Colin King" <colin.king@canonical.com> wrote:
>From: Colin Ian King <colin.king@canonical.com>
>
>Although on most systems va_end is a no-op, it is good practice
>to use va_end on the function return path, especially since the
>va_start documenation states:
>
> "Each invocation of va_start() must be matched by a corresponding
> invocation of va_end() in the same function."
>
>Found with static analysis by CoverityScan, CIDs 1389477-1389479
>
>Signed-off-by: Colin Ian King <colin.king@canonical.com>
>---
> drivers/scsi/qedi/qedi_dbg.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/scsi/qedi/qedi_dbg.c b/drivers/scsi/qedi/qedi_dbg.c
>index 2bdedb9..8fd28b0 100644
>--- a/drivers/scsi/qedi/qedi_dbg.c
>+++ b/drivers/scsi/qedi/qedi_dbg.c
>@@ -52,7 +52,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> vaf.va = &va;
>
> if (!(qedi_dbg_log & QEDI_LOG_WARN))
>- return;
>+ goto ret;
>
> if (likely(qedi) && likely(qedi->pdev))
> pr_warn("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
>@@ -60,6 +60,7 @@ qedi_dbg_warn(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> else
> pr_warn("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
>
>+ret:
> va_end(va);
> }
>
>@@ -80,7 +81,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> vaf.va = &va;
>
> if (!(qedi_dbg_log & QEDI_LOG_NOTICE))
>- return;
>+ goto ret;
>
> if (likely(qedi) && likely(qedi->pdev))
> pr_notice("[%s]:[%s:%d]:%d: %pV",
>@@ -89,6 +90,7 @@ qedi_dbg_notice(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> else
> pr_notice("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
>
>+ret:
> va_end(va);
> }
>
>@@ -109,7 +111,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> vaf.va = &va;
>
> if (!(qedi_dbg_log & level))
>- return;
>+ goto ret;
>
> if (likely(qedi) && likely(qedi->pdev))
> pr_info("[%s]:[%s:%d]:%d: %pV", dev_name(&qedi->pdev->dev),
>@@ -117,6 +119,7 @@ qedi_dbg_info(struct qedi_dbg_ctx *qedi, const char
>*func, u32 line,
> else
> pr_info("[0000:00:00.0]:[%s:%d]: %pV", nfunc, line, &vaf);
>
>+ret:
> va_end(va);
> }
>
>--
>2.10.2
Acked-by: Manish Rangankar <manish.rangankar@cavium.com>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web