xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: minor fixups of xt_IDLETIMER support

Browse Source 
Add missing newline termination to a bunch of pr_debug()/pr_err()

Test: builds, and kernel net tests passes
Bug: 183485987
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I53eccc88c383259bc7a71ea688f728a0908fa765
This commit is contained in:
Maciej Żenczykowski
2021-06-16 11:40:20 -07:00
parent 15fdca98a0
commit e6c0526092
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/netfilter/xt_IDLETIMER.c
View File

@@ -112,7 +112,7 @@ static void notify_netlink_uevent(const char *iface, struct idletimer_tg *timer)
res = snprintf(iface_msg, NLMSG_MAX_SIZE, "INTERFACE=%s", res = snprintf(iface_msg, NLMSG_MAX_SIZE, "INTERFACE=%s",
iface); iface);
if (NLMSG_MAX_SIZE <= res) { if (NLMSG_MAX_SIZE <= res) {
pr_err("message too long (%d)", res); pr_err("message too long (%d)\n", res);
return; return;
} }
@@ -122,25 +122,25 @@ static void notify_netlink_uevent(const char *iface, struct idletimer_tg *timer)
state ? "active" : "inactive"); state ? "active" : "inactive");
if (NLMSG_MAX_SIZE <= res) { if (NLMSG_MAX_SIZE <= res) {
pr_err("message too long (%d)", res); pr_err("message too long (%d)\n", res);
return; return;
} }
if (state) { if (state) {
res = snprintf(uid_msg, NLMSG_MAX_SIZE, "UID=%u", timer->uid); res = snprintf(uid_msg, NLMSG_MAX_SIZE, "UID=%u", timer->uid);
if (NLMSG_MAX_SIZE <= res) if (NLMSG_MAX_SIZE <= res)
pr_err("message too long (%d)", res); pr_err("message too long (%d)\n", res);
} else { } else {
res = snprintf(uid_msg, NLMSG_MAX_SIZE, "UID="); res = snprintf(uid_msg, NLMSG_MAX_SIZE, "UID=");
if (NLMSG_MAX_SIZE <= res) if (NLMSG_MAX_SIZE <= res)
pr_err("message too long (%d)", res); pr_err("message too long (%d)\n", res);
} }
time_ns = timespec64_to_ns(&ts); time_ns = timespec64_to_ns(&ts);
res = snprintf(timestamp_msg, NLMSG_MAX_SIZE, "TIME_NS=%llu", time_ns); res = snprintf(timestamp_msg, NLMSG_MAX_SIZE, "TIME_NS=%llu", time_ns);
if (NLMSG_MAX_SIZE <= res) { if (NLMSG_MAX_SIZE <= res) {
timestamp_msg[0] = '\0'; timestamp_msg[0] = '\0';
pr_err("message too long (%d)", res); pr_err("message too long (%d)\n", res);
} }
pr_debug("putting nlmsg: <%s> <%s> <%s> <%s>\n", iface_msg, state_msg, pr_debug("putting nlmsg: <%s> <%s> <%s> <%s>\n", iface_msg, state_msg,
@@ -323,12 +323,12 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)
ret = sysfs_create_file(idletimer_tg_kobj, &info->timer->attr.attr); ret = sysfs_create_file(idletimer_tg_kobj, &info->timer->attr.attr);
if (ret < 0) { if (ret < 0) {
pr_debug("couldn't add file to sysfs"); pr_debug("couldn't add file to sysfs\n");
goto out_free_attr; goto out_free_attr;
} }
list_add(&info->timer->entry, &idletimer_tg_list); list_add(&info->timer->entry, &idletimer_tg_list);
pr_debug("timer type value is 0."); pr_debug("timer type value is 0.\n");
info->timer->timer_type = 0; info->timer->timer_type = 0;
info->timer->refcnt = 1; info->timer->refcnt = 1;
info->timer->send_nl_msg = false; info->timer->send_nl_msg = false;
@@ -389,7 +389,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info)
ret = sysfs_create_file(idletimer_tg_kobj, &info->timer->attr.attr); ret = sysfs_create_file(idletimer_tg_kobj, &info->timer->attr.attr);
if (ret < 0) { if (ret < 0) {
pr_debug("couldn't add file to sysfs"); pr_debug("couldn't add file to sysfs\n");
goto out_free_attr; goto out_free_attr;
} }
@@ -397,7 +397,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info)
kobject_uevent(idletimer_tg_kobj,KOBJ_ADD); kobject_uevent(idletimer_tg_kobj,KOBJ_ADD);
list_add(&info->timer->entry, &idletimer_tg_list); list_add(&info->timer->entry, &idletimer_tg_list);
pr_debug("timer type value is %u", info->timer_type); pr_debug("timer type value is %u\n", info->timer_type);
info->timer->timer_type = info->timer_type; info->timer->timer_type = info->timer_type;
info->timer->refcnt = 1; info->timer->refcnt = 1;
info->timer->send_nl_msg = (info->send_nl_msg != 0); info->timer->send_nl_msg = (info->send_nl_msg != 0);