1 files changed, 4 insertions, 1 deletions

diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 5cc9636e46e9..d449fa47491c 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -295,6 +295,7 @@ static int epaddr_len(struct nf_conn *ct, const char *dptr,
 static int skp_epaddr_len(struct nf_conn *ct, const char *dptr,
                           const char *limit, int *shift)
 {
+        const char *start = dptr;
         int s = *shift;
 
         /* Search for @, but stop at the end of the line.
@@ -309,8 +310,10 @@ static int skp_epaddr_len(struct nf_conn *ct, const char *dptr,
         if (dptr <= limit && *dptr == '@') {
                 dptr++;
                 (*shift)++;
-        } else
+        } else {
+                dptr = start;
                 *shift = s;
+        }
 
         return epaddr_len(ct, dptr, limit, shift);
 }