[PATCH 16/33] virfirewall: Remove impossible OOM error reporting

Peter Krempa posted 33 patches 4 years, 11 months ago
[PATCH 16/33] virfirewall: Remove impossible OOM error reporting
Posted by Peter Krempa 4 years, 11 months ago
There's nothing that would set the 'err' field of virFirewallPtr to
ENOMEM so we can remove the checks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/util/virfirewall.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index bbeb87e72d..c1b7d2268b 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -698,10 +698,6 @@ virFirewallApplyRule(virFirewallPtr firewall,
         if (rule->queryCB(firewall, rule->layer, (const char *const *)lines, rule->queryOpaque) < 0)
             return -1;

-        if (firewall->err == ENOMEM) {
-            virReportOOMError();
-            return -1;
-        }
         if (firewall->err) {
             virReportSystemError(firewall->err, "%s",
                                  _("Unable to create rule"));
@@ -769,11 +765,7 @@ virFirewallApply(virFirewallPtr firewall)
                        _("Failed to initialize a valid firewall backend"));
         goto cleanup;
     }
-    if (!firewall || firewall->err == ENOMEM) {
-        virReportOOMError();
-        goto cleanup;
-    }
-    if (firewall->err) {
+    if (!firewall || firewall->err) {
         virReportSystemError(firewall->err, "%s",
                              _("Unable to create rule"));
         goto cleanup;
-- 
2.29.2

Re: [PATCH 16/33] virfirewall: Remove impossible OOM error reporting
Posted by Ján Tomko 4 years, 11 months ago
On a Wednesday in 2021, Peter Krempa wrote:
>There's nothing that would set the 'err' field of virFirewallPtr to
>ENOMEM so we can remove the checks.
>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> src/util/virfirewall.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
>diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
>index bbeb87e72d..c1b7d2268b 100644
>--- a/src/util/virfirewall.c
>+++ b/src/util/virfirewall.c
>@@ -698,10 +698,6 @@ virFirewallApplyRule(virFirewallPtr firewall,
>         if (rule->queryCB(firewall, rule->layer, (const char *const *)lines, rule->queryOpaque) < 0)
>             return -1;
>
>-        if (firewall->err == ENOMEM) {
>-            virReportOOMError();
>-            return -1;
>-        }
>         if (firewall->err) {
>             virReportSystemError(firewall->err, "%s",
>                                  _("Unable to create rule"));
>@@ -769,11 +765,7 @@ virFirewallApply(virFirewallPtr firewall)
>                        _("Failed to initialize a valid firewall backend"));
>         goto cleanup;
>     }
>-    if (!firewall || firewall->err == ENOMEM) {
>-        virReportOOMError();
>-        goto cleanup;
>-    }
>-    if (firewall->err) {
>+    if (!firewall || firewall->err) {
>         virReportSystemError(firewall->err, "%s",


Coverity complains about a possible NULL dereference here if firewall ==
NULL.

Jano

>                              _("Unable to create rule"));
>         goto cleanup;
>-- 
>2.29.2
>