patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: shell: ensure the shell sh is valid before call shell_printf

Browse source 
It is possible that the `sh` was not set before use.
This change adds a NULL check for `sh` in the following macros:
PR, PR_SHELL, PR_ERROR, PR_INFO, and PR_WARNING.
In case `sh` is NULL, the above macros will call `printk` instead.

Fixes #68793

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
This commit is contained in:
Pisit Sawangvonganan 2024-02-09 21:03:47 +07:00 committed by Fabio Baltieri
parent f4c8020d45
commit 7b8a9e1818
1 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
subsys/net/lib/shell/net_shell_private.h
View file

@ -8,20 +8,50 @@
#include <zephyr/shell/shell.h>
#include <zephyr/net/net_ip.h>
#define PR(fmt, ...) \
shell_fprintf(sh, SHELL_NORMAL, fmt, ##__VA_ARGS__)
#define PR(fmt, ...) \
do { \
if (sh) { \
shell_fprintf(sh, SHELL_NORMAL, fmt, ##__VA_ARGS__); \
} else { \
printk(fmt, ##__VA_ARGS__); \
} \
} while (false)
#define PR_SHELL(sh, fmt, ...) \
shell_fprintf(sh, SHELL_NORMAL, fmt, ##__VA_ARGS__)
#define PR_SHELL(sh, fmt, ...) \
do { \
if (sh) { \
shell_fprintf(sh, SHELL_NORMAL, fmt, ##__VA_ARGS__); \
} else { \
printk(fmt, ##__VA_ARGS__); \
} \
} while (false)
#define PR_ERROR(fmt, ...) \
shell_fprintf(sh, SHELL_ERROR, fmt, ##__VA_ARGS__)
#define PR_ERROR(fmt, ...) \
do { \
if (sh) { \
shell_fprintf(sh, SHELL_ERROR, fmt, ##__VA_ARGS__); \
} else { \
printk(fmt, ##__VA_ARGS__); \
} \
} while (false)
#define PR_INFO(fmt, ...) \
shell_fprintf(sh, SHELL_INFO, fmt, ##__VA_ARGS__)
#define PR_INFO(fmt, ...) \
do { \
if (sh) { \
shell_fprintf(sh, SHELL_INFO, fmt, ##__VA_ARGS__); \
} else { \
printk(fmt, ##__VA_ARGS__); \
} \
} while (false)
#define PR_WARNING(fmt, ...) \
shell_fprintf(sh, SHELL_WARNING, fmt, ##__VA_ARGS__)
#define PR_WARNING(fmt, ...) \
do { \
if (sh) { \
shell_fprintf(sh, SHELL_WARNING, fmt, ##__VA_ARGS__); \
} else { \
printk(fmt, ##__VA_ARGS__); \
} \
} while (false)
#include "net_private.h"
#include "../ip/ipv6.h"