inet_diag: Add equal-operator for ports

inet_diag currently provides less/greater than or equal operators for
comparing ports when filtering sockets. An equal comparison can be
performed by combining the two existing operators, or a user can for
example request a port range and then do the final filtering in
userspace. However, these approaches both have drawbacks. Implementing
equal using LE/GE causes the size and complexity of a filter to grow
quickly as the number of ports increase, while it on busy machines would
be great if the kernel only returns information about relevant sockets.

This patch introduces source and destination port equal operators.
INET_DIAG_BC_S_EQ is used to match a source port, INET_DIAG_BC_D_EQ a
destination port, and usage is the same as for the existing port
operators.  I.e., the port to match is stored in the no-member of the
next inet_diag_bc_op-struct in the filter.

Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index 817d807e9481d30d7267a44223fbec0f4360692c..14565d703291b949193bde44638007e2d175edd5 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -92,6 +92,8 @@ enum {
        INET_DIAG_BC_D_COND,
        INET_DIAG_BC_DEV_COND,   /* u32 ifindex */
        INET_DIAG_BC_MARK_COND,
+       INET_DIAG_BC_S_EQ,
+       INET_DIAG_BC_D_EQ,
 };
 
 struct inet_diag_hostcond {

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index c9c35b61a027e83535eae478d927b7b46334ba4a..a383f299ce246bd84b28bad1909bae600ad699c0 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -564,12 +564,18 @@ static int inet_diag_bc_run(const struct nlattr *_bc,
                case INET_DIAG_BC_JMP:
                        yes = 0;
                        break;
+               case INET_DIAG_BC_S_EQ:
+                       yes = entry->sport == op[1].no;
+                       break;
                case INET_DIAG_BC_S_GE:
                        yes = entry->sport >= op[1].no;
                        break;
                case INET_DIAG_BC_S_LE:
                        yes = entry->sport <= op[1].no;
                        break;
+               case INET_DIAG_BC_D_EQ:
+                       yes = entry->dport == op[1].no;
+                       break;
                case INET_DIAG_BC_D_GE:
                        yes = entry->dport >= op[1].no;
                        break;
@@ -802,8 +808,10 @@ static int inet_diag_bc_audit(const struct nlattr *attr,
                        if (!valid_devcond(bc, len, &min_len))
                                return -EINVAL;
                        break;
+               case INET_DIAG_BC_S_EQ:
                case INET_DIAG_BC_S_GE:
                case INET_DIAG_BC_S_LE:
+               case INET_DIAG_BC_D_EQ:
                case INET_DIAG_BC_D_GE:
                case INET_DIAG_BC_D_LE:
                        if (!valid_port_comparison(bc, len, &min_len))