nscd: avoid assertion failure during persistent db check

Message ID mvmfu2t2grx.fsf@suse.de
State Superseded
Headers show
Series
  • nscd: avoid assertion failure during persistent db check
Related show

Commit Message

Andreas Schwab May 15, 2018, 1:24 p.m.
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(-)

-- 
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."

Comments

Florian Weimer May 15, 2018, 1:34 p.m. | #1
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
Andreas Schwab May 15, 2018, 1:45 p.m. | #2
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."
Andreas Schwab May 15, 2018, 3:04 p.m. | #3
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."

Patch

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))