| Message ID | 1426153078-20863-1-git-send-email-iwilson@brocade.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Mar 12, 2015 at 09:37:58AM +0000, Ian Wilson wrote: > nfnl_cthelper_parse_tuple() is called from nfnl_cthelper_new(), > nfnl_cthelper_get() and nfnl_cthelper_del(). In each case they pass > a pointer to an nf_conntrack_tuple data structure local variable: > > struct nf_conntrack_tuple tuple; > ... > ret = nfnl_cthelper_parse_tuple(&tuple, tb[NFCTH_TUPLE]); > > The problem is that this local variable is not initialized, and > nfnl_cthelper_parse_tuple() only initializes two fields: src.l3num and > dst.protonum. This leaves all other fields with undefined values > based on whatever is on the stack: > > tuple->src.l3num = ntohs(nla_get_be16(tb[NFCTH_TUPLE_L3PROTONUM])); > tuple->dst.protonum = nla_get_u8(tb[NFCTH_TUPLE_L4PROTONUM]); > > The symptom observed was that when the rpc and tns helpers were added > then traffic to port 1536 was being sent to user-space. Applied, thanks. I'll pass this to -stable too. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index a5599fc..54330fb 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -77,6 +77,9 @@ nfnl_cthelper_parse_tuple(struct nf_conntrack_tuple *tuple, if (!tb[NFCTH_TUPLE_L3PROTONUM] || !tb[NFCTH_TUPLE_L4PROTONUM]) return -EINVAL; + /* Not all fields are initialized so first zero the tuple */ + memset(tuple, 0, sizeof(struct nf_conntrack_tuple)); + tuple->src.l3num = ntohs(nla_get_be16(tb[NFCTH_TUPLE_L3PROTONUM])); tuple->dst.protonum = nla_get_u8(tb[NFCTH_TUPLE_L4PROTONUM]);
nfnl_cthelper_parse_tuple() is called from nfnl_cthelper_new(), nfnl_cthelper_get() and nfnl_cthelper_del(). In each case they pass a pointer to an nf_conntrack_tuple data structure local variable: struct nf_conntrack_tuple tuple; ... ret = nfnl_cthelper_parse_tuple(&tuple, tb[NFCTH_TUPLE]); The problem is that this local variable is not initialized, and nfnl_cthelper_parse_tuple() only initializes two fields: src.l3num and dst.protonum. This leaves all other fields with undefined values based on whatever is on the stack: tuple->src.l3num = ntohs(nla_get_be16(tb[NFCTH_TUPLE_L3PROTONUM])); tuple->dst.protonum = nla_get_u8(tb[NFCTH_TUPLE_L4PROTONUM]); The symptom observed was that when the rpc and tns helpers were added then traffic to port 1536 was being sent to user-space. Signed-off-by: Ian Wilson <iwilson@brocade.com> --- net/netfilter/nfnetlink_cthelper.c | 3 +++ 1 file changed, 3 insertions(+)