* [PATCH] nscd: avoid assertion failure during persistent db check
@ 2018-12-18 14:10 Andreas Schwab
2018-12-19 10:50 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2018-12-18 14:10 UTC (permalink / raw)
To: libc-alpha
nscd should not abort when it finds inconsistencies in the persistent db.
* nscd/connections.c (check_use): Don't abort on invalid len.
---
nscd/connections.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nscd/connections.c b/nscd/connections.c
index 47fbb9923a..9818200764 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -304,7 +304,8 @@ static int
check_use (const char *data, nscd_ssize_t first_free, uint8_t *usemap,
enum usekey use, ref_t start, size_t len)
{
- assert (len >= 2);
+ if (len < 2)
+ return 0;
if (start > first_free || start + len > first_free
|| (start & BLOCK_ALIGN_M1))
--
2.20.0
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] nscd: avoid assertion failure during persistent db check
2018-12-18 14:10 [PATCH] nscd: avoid assertion failure during persistent db check Andreas Schwab
@ 2018-12-19 10:50 ` Florian Weimer
0 siblings, 0 replies; 6+ messages in thread
From: Florian Weimer @ 2018-12-19 10:50 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha
* Andreas Schwab:
> nscd should not abort when it finds inconsistencies in the persistent db.
>
> * nscd/connections.c (check_use): Don't abort on invalid len.
> ---
> nscd/connections.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/nscd/connections.c b/nscd/connections.c
> index 47fbb9923a..9818200764 100644
> --- a/nscd/connections.c
> +++ b/nscd/connections.c
> @@ -304,7 +304,8 @@ static int
> check_use (const char *data, nscd_ssize_t first_free, uint8_t *usemap,
> enum usekey use, ref_t start, size_t len)
> {
> - assert (len >= 2);
> + if (len < 2)
> + return 0;
This looks okay to me. (nscd_init logs a message if verification of a
persistent database fails.)
Thanks,
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] nscd: avoid assertion failure during persistent db check
@ 2018-05-15 13:24 Andreas Schwab
2018-05-15 13:35 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2018-05-15 13:24 UTC (permalink / raw)
To: libc-alpha
nscd should not abort when it finds inconsistencies in the persistent db.
* nscd/connections.c (check_use): Don't abort on invalid len.
---
nscd/connections.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nscd/connections.c b/nscd/connections.c
index 5f91985859..d2ac3147a0 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -327,7 +327,8 @@ static int
check_use (const char *data, nscd_ssize_t first_free, uint8_t *usemap,
enum usekey use, ref_t start, size_t len)
{
- assert (len >= 2);
+ if (len < 2)
+ return 0;
if (start > first_free || start + len > first_free
|| (start & BLOCK_ALIGN_M1))
--
2.17.0
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] nscd: avoid assertion failure during persistent db check
2018-05-15 13:24 Andreas Schwab
@ 2018-05-15 13:35 ` Florian Weimer
2018-05-15 13:45 ` Andreas Schwab
2018-05-15 15:04 ` Andreas Schwab
0 siblings, 2 replies; 6+ messages in thread
From: Florian Weimer @ 2018-05-15 13:35 UTC (permalink / raw)
To: Andreas Schwab, libc-alpha
On 05/15/2018 03:24 PM, Andreas Schwab wrote:
> - assert (len >= 2);
> + if (len < 2)
> + return 0;
Shouldn't it log a warning at least? Something went very wrong, after all.
Does this need a bug?
Thanks,
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] nscd: avoid assertion failure during persistent db check
2018-05-15 13:35 ` Florian Weimer
@ 2018-05-15 13:45 ` Andreas Schwab
2018-05-15 15:04 ` Andreas Schwab
1 sibling, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2018-05-15 13:45 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
On Mai 15 2018, Florian Weimer <fweimer@redhat.com> wrote:
> On 05/15/2018 03:24 PM, Andreas Schwab wrote:
>> - assert (len >= 2);
>> + if (len < 2)
>> + return 0;
>
> Shouldn't it log a warning at least?
The caller does.
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] nscd: avoid assertion failure during persistent db check
2018-05-15 13:35 ` Florian Weimer
2018-05-15 13:45 ` Andreas Schwab
@ 2018-05-15 15:04 ` Andreas Schwab
1 sibling, 0 replies; 6+ messages in thread
From: Andreas Schwab @ 2018-05-15 15:04 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
On Mai 15 2018, Florian Weimer <fweimer@redhat.com> wrote:
> Does this need a bug?
Filed as 23184.
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-12-19 10:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-18 14:10 [PATCH] nscd: avoid assertion failure during persistent db check Andreas Schwab
2018-12-19 10:50 ` Florian Weimer
-- strict thread matches above, loose matches on Subject: below --
2018-05-15 13:24 Andreas Schwab
2018-05-15 13:35 ` Florian Weimer
2018-05-15 13:45 ` Andreas Schwab
2018-05-15 15:04 ` Andreas Schwab
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 read-only IMAP folder(s) and NNTP newsgroup(s).