obj: handle ENOMEM during vector allocations

When missing, Handle ENOMEM during vector allocations to avoid later crashing. Ref: pmem/issues#5515 Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
pmem · Mar 1, 2023 · be023c9 · be023c9
1 parent 3c623ae
commit be023c9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/src/libpmemobj/memops.c b/src/libpmemobj/memops.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2016-2022, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memops.c -- aggregated memory operations helper implementation
@@ -590,7 +590,7 @@ operation_user_buffer_verify_align(struct operation_context *ctx,
 /*
  * operation_add_user_buffer -- add user buffer to the ulog
  */
-void
+int
 operation_add_user_buffer(struct operation_context *ctx,
 		struct user_buffer_def *userbuf)
 {
@@ -614,9 +614,11 @@ operation_add_user_buffer(struct operation_context *ctx,
 	last_log->next = buffer_offset;
 	pmemops_persist(ctx->p_ops, &last_log->next, next_size);
 
-	VEC_PUSH_BACK(&ctx->next, buffer_offset);
+	if (VEC_PUSH_BACK(&ctx->next, buffer_offset) != 0)
+		return -1;
 	ctx->ulog_capacity += capacity;
 	operation_set_any_user_buffer(ctx, 1);
+	return 0;
 }
 
 /*

diff --git a/src/libpmemobj/memops.h b/src/libpmemobj/memops.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memops.h -- aggregated memory operations helper definitions
@@ -63,7 +63,7 @@ int operation_add_typed_entry(struct operation_context *ctx,
 	ulog_operation_type type, enum operation_log_type log_type);
 int operation_user_buffer_verify_align(struct operation_context *ctx,
 		struct user_buffer_def *userbuf);
-void operation_add_user_buffer(struct operation_context *ctx,
+int operation_add_user_buffer(struct operation_context *ctx,
 		struct user_buffer_def *userbuf);
 void operation_set_auto_reserve(struct operation_context *ctx,
 		int auto_reserve);

diff --git a/src/libpmemobj/recycler.c b/src/libpmemobj/recycler.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2016-2021, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * recycler.c -- implementation of run recycler
@@ -274,7 +274,8 @@ recycler_recalc(struct recycler *r, int force)
 			if (VEC_PUSH_BACK(&runs, nm) != 0)
 				ASSERT(0); /* XXX: fix after refactoring */
 		} else {
-			VEC_PUSH_BACK(&r->recalc, e);
+			if (VEC_PUSH_BACK(&r->recalc, e) != 0)
+				ASSERT(0); /* XXX: fix after refactoring */
 		}
 	} while (found_units < search_limit);
 

diff --git a/src/libpmemobj/tx.c b/src/libpmemobj/tx.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * tx.c -- transactions implementation
@@ -194,7 +194,8 @@ tx_action_add(struct tx *tx)
 	if (tx_action_reserve(tx, 1) != 0)
 		return NULL;
 
-	VEC_INC_BACK(&tx->actions);
+	if (VEC_INC_BACK(&tx->actions) == -1)
+		return NULL;
 
 	return &VEC_BACK(&tx->actions);
 }
@@ -710,7 +711,8 @@ tx_construct_user_buffer(struct tx *tx, void *addr, size_t size,
 		tx->redo_userbufs_capacity +=
 			userbuf.size - TX_INTENT_LOG_BUFFER_OVERHEAD;
 	} else {
-		operation_add_user_buffer(ctx, &userbuf);
+		if (operation_add_user_buffer(ctx, &userbuf) == -1)
+			goto err;
 	}
 
 	return 0;
@@ -1013,8 +1015,11 @@ pmemobj_tx_commit(void)
 		operation_start(tx->lane->external);
 
 		struct user_buffer_def *userbuf;
+		struct operation_context *ctx = tx->lane->external;
 		VEC_FOREACH_BY_PTR(userbuf, &tx->redo_userbufs)
-			operation_add_user_buffer(tx->lane->external, userbuf);
+			if (operation_add_user_buffer(ctx, userbuf) == -1)
+				FATAL("%s: failed to allocate the next vector",
+					__func__);
 
 		palloc_publish(&pop->heap, VEC_ARR(&tx->actions),
 			VEC_SIZE(&tx->actions), tx->lane->external);
@@ -1921,7 +1926,11 @@ pmemobj_tx_xpublish(struct pobj_action *actv, size_t actvcnt, uint64_t flags)
 	}
 
 	for (size_t i = 0; i < actvcnt; ++i) {
-		VEC_PUSH_BACK(&tx->actions, actv[i]);
+		if (VEC_PUSH_BACK(&tx->actions, actv[i]) != 0) {
+			int ret = obj_tx_fail_err(ENOMEM, flags);
+			PMEMOBJ_API_END();
+			return ret;
+		}
 	}
 
 	PMEMOBJ_API_END();

diff --git a/src/libpmemobj/ulog.c b/src/libpmemobj/ulog.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * ulog.c -- unified log implementation
@@ -225,7 +225,7 @@ ulog_rebuild_next_vec(struct ulog *ulog, struct ulog_next *next,
 {
 	do {
 		if (ulog->next != 0)
-			VEC_PUSH_BACK(next, ulog->next);
+			ASSERT(VEC_PUSH_BACK(next, ulog->next) == 0);
 	} while ((ulog = ulog_next(ulog, p_ops)) != NULL);
 }
 
@@ -257,7 +257,7 @@ ulog_reserve(struct ulog *ulog,
 	while (capacity < *new_capacity) {
 		if (extend(p_ops->base, &ulog->next, gen_num) != 0)
 			return -1;
-		VEC_PUSH_BACK(next, ulog->next);
+		ASSERT(VEC_PUSH_BACK(next, ulog->next) == 0);
 		ulog = ulog_next(ulog, p_ops);
 		ASSERTne(ulog, NULL);