aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unix-socket/hostbits: fix ipv6 address parsing

Browse Source 
In `add-hostbit`, `remove-hostbit` and `list-hostbit` commands, the IPv6
address parsing was not using the correct variable:

                 from /usr/include/dirent.h:25,
                 from suricata-common.h:73,
                 from runmode-unix-socket.c:18:
In function ‘inet_pton’,
    inlined from ‘UnixSocketHostbitAdd’ at runmode-unix-socket.c:1316:13:
/usr/include/x86_64-linux-gnu/bits/inet-fortified.h:56:10: warning: call to ‘__inet_pton_chk_warn’ declared with attribute warning: inet_pton called with a destination buffer size too small [-Wattribute-warning]
   56 |   return __glibc_fortify (inet_pton, __sz, sizeof (char),
      |          ^~~~~~~~~~~~~~~
In function ‘inet_pton’,
    inlined from ‘UnixSocketHostbitRemove’ at runmode-unix-socket.c:1403:13:
/usr/include/x86_64-linux-gnu/bits/inet-fortified.h:56:10: warning: call to ‘__inet_pton_chk_warn’ declared with attribute warning: inet_pton called with a destination buffer size too small [-Wattribute-warning]
   56 |   return __glibc_fortify (inet_pton, __sz, sizeof (char),
      |          ^~~~~~~~~~~~~~~
In function ‘inet_pton’,
    inlined from ‘UnixSocketHostbitList’ at runmode-unix-socket.c:1476:13:
/usr/include/x86_64-linux-gnu/bits/inet-fortified.h:56:10: warning: call to ‘__inet_pton_chk_warn’ declared with attribute warning: inet_pton called with a destination buffer size too small [-Wattribute-warning]
   56 |   return __glibc_fortify (inet_pton, __sz, sizeof (char),
      |          ^~~~~~~~~~~~~~~

Bug: #8102.
(cherry picked from commit 874a0e8d3d)
pull/14370/head
Victor Julien 5 months ago
parent da8e37b2b8
commit 3f88e5c64c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/runmode-unix-socket.c
Unescape Escape View File

@ -1313,7 +1313,7 @@ TmEcode UnixSocketHostbitAdd(json_t *cmd, json_t* answer, void *data_usused)
if (inet_pton(AF_INET, ipaddress, &in) != 1) {
uint32_t in6[4];
memset(&in6, 0, sizeof(in6));
if (inet_pton(AF_INET6, ipaddress, &in) != 1) {
if (inet_pton(AF_INET6, ipaddress, &in6) != 1) {
json_object_set_new(answer, "message", json_string("invalid address string"));
return TM_ECODE_FAILED;
} else {
@ -1400,7 +1400,7 @@ TmEcode UnixSocketHostbitRemove(json_t *cmd, json_t* answer, void *data_unused)
if (inet_pton(AF_INET, ipaddress, &in) != 1) {
uint32_t in6[4];
memset(&in6, 0, sizeof(in6));
if (inet_pton(AF_INET6, ipaddress, &in) != 1) {
if (inet_pton(AF_INET6, ipaddress, &in6) != 1) {
json_object_set_new(answer, "message", json_string("invalid address string"));
return TM_ECODE_FAILED;
} else {
@ -1473,7 +1473,7 @@ TmEcode UnixSocketHostbitList(json_t *cmd, json_t* answer, void *data_unused)
if (inet_pton(AF_INET, ipaddress, &in) != 1) {
uint32_t in6[4];
memset(&in6, 0, sizeof(in6));
if (inet_pton(AF_INET6, ipaddress, &in) != 1) {
if (inet_pton(AF_INET6, ipaddress, &in6) != 1) {
json_object_set_new(answer, "message", json_string("invalid address string"));
return TM_ECODE_FAILED;
} else {

Write Preview
Loading…
Cancel
Save