lorawan: clock_sync: assert instead of error code (bb6cb0f1) · Commits · Wenxi XU / zephyr

Assert that the size provided to `clock_sync_serialize_device_time` is sufficient, instead of returning an error code. The condition is already enforced by the calling code, and returning an error code is incorrect when the return code is unconditionally being used to increment the buffer offset by callers. Fixes #84720. Signed-off-by:

Jordan Yates <jordan@embeint.com>

subsys/lorawan/services/clock_sync.c

+3 −4

Changes for subsys/lorawan/services/clock_sync.c: 3 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <zephyr/lorawan/lorawan.h>
		#include <zephyr/logging/log.h>
		#include <zephyr/random/random.h>
		#include <zephyr/sys/__assert.h>

		LOG_MODULE_REGISTER(lorawan_clock_sync, CONFIG_LORAWAN_SERVICES_LOG_LEVEL);

		@@ -69,13 +70,11 @@ static struct clock_sync_context ctx;
		*
		* @returns number of bytes written or -ENOSPC in case of error
		*/
		static int clock_sync_serialize_device_time(uint8_t *buf, size_t size)
		static uint8_t clock_sync_serialize_device_time(uint8_t *buf, size_t size)
		{
		uint32_t device_time = k_uptime_seconds() + ctx.time_offset;

		if (size < sizeof(uint32_t)) {
		return -ENOSPC;
		}
		__ASSERT_NO_MSG(size >= sizeof(uint32_t));

		buf[0] = (device_time >> 0) & 0xFF;
		buf[1] = (device_time >> 8) & 0xFF;

Admin message