[v4,1/2] nss: add assert to DB_LOOKUP_FCT (BZ #28752)

Message ID 20220605035710.832386-1-sam@gentoo.org
State Committed
Commit 3fdf0a205b622e40fa7e3c4ed1e4ed4d5c6c5380
Headers
Series [v4,1/2] nss: add assert to DB_LOOKUP_FCT (BZ #28752) |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Sam James June 5, 2022, 3:57 a.m. UTC
  It's interesting if we have a null action list,
so an assert is worthwhile.

Suggested-by: DJ Delorie <dj@redhat.com>
Signed-off-by: Sam James <sam@gentoo.org>
---
 nss/XXX-lookup.c | 5 +++++
 1 file changed, 5 insertions(+)
  

Comments

DJ Delorie June 9, 2022, 1:29 a.m. UTC | #1
LGTM, passes CI/CD

Reviewed-by: DJ Delorie <dj@redhat.com>

I'll push it in a moment.
  

Patch

diff --git a/nss/XXX-lookup.c b/nss/XXX-lookup.c
index db95937674..bfc57b8e64 100644
--- a/nss/XXX-lookup.c
+++ b/nss/XXX-lookup.c
@@ -15,6 +15,7 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <assert.h>
 #include "nsswitch.h"
 
 /*******************************************************************\
@@ -54,6 +55,10 @@  DB_LOOKUP_FCT (nss_action_list *ni, const char *fct_name, const char *fct2_name,
 
   *ni = DATABASE_NAME_SYMBOL;
 
+  /* We want to know about it if we've somehow got a NULL action list;
+   in the past, we had bad state if seccomp interfered with setup. */
+  assert(*ni != NULL);
+
   return __nss_lookup (ni, fct_name, fct2_name, fctp);
 }
 libc_hidden_def (DB_LOOKUP_FCT)