Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ea0452c authored by Joey Pabalinas's avatar Joey Pabalinas Committed by Greg Kroah-Hartman
Browse files

tty/nozomi: cleanup DUMP() macro 



Replace snprint() with strscpy() and use min_t() instead of
the conditional operator to clamp buffer length.

Signed-off-by: default avatarJoey Pabalinas <joeypabalinas@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1c734cb

drivers/tty/nozomi.c

+13 −13
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ do { \ 
	do {								\

		char tbuf[TMP_BUF_MAX] = {0};				\

		if (len__ > 1) {					\

	snprintf(tbuf, len__ > TMP_BUF_MAX ? TMP_BUF_MAX : len__, "%s", buf__);\

	if (tbuf[len__-2] == '\r') {\

		tbuf[len__-2] = 'r';\

	} \

			u32 data_len = min_t(u32, len__, TMP_BUF_MAX);	\

			strscpy(tbuf, buf__, data_len);			\

			if (tbuf[data_len - 2] == '\r')			\

				tbuf[data_len - 2] = 'r';		\

			DBG1("SENDING: '%s' (%d+n)", tbuf, len__);	\

		} else {						\

			DBG1("SENDING: '%s' (%d)", tbuf, len__);	\