lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "netfilter: conntrack: don't refresh sctp entries in closed state"

Browse Source 
This reverts commit ba4b40356a which is
commit 77b337196a9d87f3d6bb9b07c0436ecafbffda1e upstream.

It needs to be reverted as it breaks the build because the previous
commit 35452319ba ("Revert "netfilter: conntrack: allow sctp hearbeat
after connection re-use"") reverted the change that this one is
"fixing" so it is not needed.

This fixes the build breakage with the merge of 5.4.181 into the
android11-5.4-lts branch.

Fixes: 56f5213db8 ("Merge 5.4.181 into android11-5.4-lts")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia09f24936ac37a047f48e6e22e1b72204b1a6600
This commit is contained in:
Greg Kroah-Hartman 2022-02-23 15:08:43 +01:00
parent 56f5213db8
commit 2867afd647
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/netfilter/nf_conntrack_proto_sctp.c
View File

@ -462,15 +462,6 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct,
pr_debug("Setting vtag %x for dir %d\n",
ih->init_tag, !dir);
ct->proto.sctp.vtag[!dir] = ih->init_tag;
/* don't renew timeout on init retransmit so
* port reuse by client or NAT middlebox cannot
* keep entry alive indefinitely (incl. nat info).
*/
if (new_state == SCTP_CONNTRACK_CLOSED &&
old_state == SCTP_CONNTRACK_CLOSED &&
nf_ct_is_confirmed(ct))
ignore = true;
}
ct->proto.sctp.state = new_state;