Date: Wed, 6 Sep 2017 10:21:28 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r323216 - stable/11/sys/netipsec Message-ID: <201709061021.v86ALSvx087268@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Wed Sep 6 10:21:28 2017 New Revision: 323216 URL: https://svnweb.freebsd.org/changeset/base/323216 Log: MFC r323086: Fix possible double releasing for SA reference. This is missing part of r318734. When crypto subsystem returns error the xform code handles an error independently. PR: 221849 Modified: stable/11/sys/netipsec/udpencap.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netipsec/udpencap.c ============================================================================== --- stable/11/sys/netipsec/udpencap.c Wed Sep 6 09:19:54 2017 (r323215) +++ stable/11/sys/netipsec/udpencap.c Wed Sep 6 10:21:28 2017 (r323216) @@ -120,7 +120,7 @@ udp_ipsec_input(struct mbuf *m, int off, int af) struct udphdr *udp; struct ip *ip; uint32_t spi; - int error, hlen; + int hlen; /* * Just return if packet doesn't have enough data. @@ -205,10 +205,7 @@ udp_ipsec_input(struct mbuf *m, int off, int af) * will do this anyway, so don't touch them here. */ ESPSTAT_INC(esps_input); - error = (*sav->tdb_xform->xf_input)(m, sav, hlen, off); - if (error != 0) - key_freesav(&sav); - + (*sav->tdb_xform->xf_input)(m, sav, hlen, off); return (EINPROGRESS); /* Consumed by IPsec. */ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709061021.v86ALSvx087268>