Message ID | 1549853574-17643-1-git-send-email-lirongqing@baidu.com |
---|---|
State | Accepted |
Commit | 78a0b2721fc8a3664d99380d55a43638847a9c8f |
Headers | show |
Series | [ovs-dev,v2] conntrack: Remove unnecessary check in process_ftp_ctl_v4 | expand |
On Mon, Feb 11, 2019 at 10:52:54AM +0800, Li RongQing wrote: > It has been assured that both first and second int from ftp > command are not bigger than 255, so their combination(first > int << 8 +second int) must not bigger than 65535 > > Co-authored-by: Wang Li <wangli39@baidu.com> > Signed-off-by: Wang Li <wangli39@baidu.com> > Signed-off-by: Li RongQing <lirongqing@baidu.com> > Cc: Darrell Ball <dlu998@gmail.com> Thanks, applied to master.
diff --git a/lib/conntrack.c b/lib/conntrack.c index 6b46d0ca3..315a19e9e 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2997,12 +2997,7 @@ process_ftp_ctl_v4(struct conntrack *ct, return CT_FTP_CTL_INVALID; } - uint16_t port_lo_hs = value; - if (65535 - port_hs < port_lo_hs) { - return CT_FTP_CTL_INVALID; - } - - port_hs |= port_lo_hs; + port_hs |= value; ovs_be16 port = htons(port_hs); ovs_be32 conn_ipv4_addr;