Commit 1a31526b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

[NETFILTER]: ctnetlink: remove impossible events tests for updates 



IPCT_HELPER and IPCT_NATINFO bits are never set on updates.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3a27bfb

net/ipv4/netfilter/ip_conntrack_netlink.c

+1 −5
Original line number Diff line number Diff line
@@ -329,11 +329,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
		/* dump everything */

		events = ~0UL;

		group = NFNLGRP_CONNTRACK_NEW;

	} else if (events & (IPCT_STATUS |

		      IPCT_PROTOINFO |

		      IPCT_HELPER |

		      IPCT_HELPINFO |

		      IPCT_NATINFO)) {

	} else if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {

		type = IPCTNL_MSG_CT_NEW;

		group = NFNLGRP_CONNTRACK_UPDATE;

	} else

net/netfilter/nf_conntrack_netlink.c

+1 −5
Original line number Diff line number Diff line
@@ -339,11 +339,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this, 
		/* dump everything */

		events = ~0UL;

		group = NFNLGRP_CONNTRACK_NEW;

	} else  if (events & (IPCT_STATUS |

		      IPCT_PROTOINFO |

		      IPCT_HELPER |

		      IPCT_HELPINFO |

		      IPCT_NATINFO)) {

	} else  if (events & (IPCT_STATUS | IPCT_PROTOINFO)) {

		type = IPCTNL_MSG_CT_NEW;

		group = NFNLGRP_CONNTRACK_UPDATE;

	} else

CRA Git | Maintained and supported by SUSTech CRA and CCSE