From: Hazem Mohamed Abuelfotoh <abuehaze@amazon.com>
To: <dhowells@redhat.com>, <keyrings@vger.kernel.org>
Cc: <benh@amazon.com>, <ptyadav@amazon.com>,
Hazem Mohamed Abuelfotoh <abuehaze@amazon.com>
Subject: [PATCH] Pass "err" argument by address to "_nsError" function
Date: Mon, 17 Feb 2025 00:54:52 +0000 [thread overview]
Message-ID: <20250217005452.4873-1-abuehaze@amazon.com> (raw)
Commit 0d71523ab584 (“DNS: Support AFS SRV records and
cell db config files”) has refactored the "nsError" function
by moving some of error handling to "_nsError" function
however we are passing the "err" argument to "_nsError"
by value not by address which is wrong as that basically
waste any processing we do in the "_nsError" function
so correcting that by passing "err" by address.
Reported-by: Pratyush Yadav <ptyadav@amazon.com>
Signed-off-by: Hazem Mohamed Abuelfotoh <abuehaze@amazon.com>
---
dns.afsdb.c | 4 ++--
key.dns.h | 2 +-
key.dns_resolver.c | 20 ++++++++++----------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dns.afsdb.c b/dns.afsdb.c
index 986c0f3..7bffb60 100644
--- a/dns.afsdb.c
+++ b/dns.afsdb.c
@@ -228,7 +228,7 @@ static int dns_query_AFSDB(const char *cell)
if (response_len < 0) {
/* negative result */
- _nsError(h_errno, cell);
+ _nsError(&h_errno, cell);
return -1;
}
@@ -267,7 +267,7 @@ static int dns_query_VL_SRV(const char *cell)
if (response_len < 0) {
/* negative result */
- _nsError(h_errno, cell);
+ _nsError(&h_errno, cell);
return -1;
}
diff --git a/key.dns.h b/key.dns.h
index 33d0ab3..2fedbc3 100644
--- a/key.dns.h
+++ b/key.dns.h
@@ -59,7 +59,7 @@ extern __attribute__((format(printf, 1, 2)))
void info(const char *fmt, ...);
extern __attribute__((noreturn))
void nsError(int err, const char *domain);
-extern void _nsError(int err, const char *domain);
+extern void _nsError(int *err, const char *domain);
extern __attribute__((format(printf, 1, 2)))
void debug(const char *fmt, ...);
diff --git a/key.dns_resolver.c b/key.dns_resolver.c
index 7a7ec42..6b16427 100644
--- a/key.dns_resolver.c
+++ b/key.dns_resolver.c
@@ -157,19 +157,20 @@ static const int ns_errno_map[] = {
[NO_DATA] = ENODATA,
};
-void _nsError(int err, const char *domain)
+void _nsError(int *err, const char *domain)
{
if (isatty(2))
- fprintf(stderr, "NS:%s: %s.\n", domain, hstrerror(err));
+ fprintf(stderr, "NS:%s: %s.\n", domain, hstrerror(*err));
else
- syslog(LOG_INFO, "%s: %s", domain, hstrerror(err));
+ syslog(LOG_INFO, "%s: %s", domain, hstrerror(*err));
- if (err >= sizeof(ns_errno_map) / sizeof(ns_errno_map[0]))
- err = ECONNREFUSED;
- else
- err = ns_errno_map[err];
+ if (*err >= sizeof(ns_errno_map) / sizeof(ns_errno_map[0]))
+ *err = ECONNREFUSED;
+ else{
+ *err = ns_errno_map[*err];
+ }
- info("Reject the key with error %d", err);
+ info("Reject the key with error %d", *err);
}
void nsError(int err, const char *domain)
@@ -177,8 +178,7 @@ void nsError(int err, const char *domain)
unsigned timeout;
int ret;
- _nsError(err, domain);
-
+ _nsError(&err, domain);
switch (err) {
case TRY_AGAIN:
timeout = 1;
--
2.47.1
next reply other threads:[~2025-02-17 0:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-17 0:54 Hazem Mohamed Abuelfotoh [this message]
2025-02-17 13:03 ` [PATCH] Pass "err" argument by address to "_nsError" function Pratyush Yadav
2025-02-17 15:25 ` Mohamed Abuelfotoh, Hazem
2025-02-17 16:27 ` Jarkko Sakkinen
2025-02-18 12:10 ` Mohamed Abuelfotoh, Hazem
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=20250217005452.4873-1-abuehaze@amazon.com \
--to=abuehaze@amazon.com \
--cc=benh@amazon.com \
--cc=dhowells@redhat.com \
--cc=keyrings@vger.kernel.org \
--cc=ptyadav@amazon.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.