Re: workaround for VMware WS NAT bug triggered by OpenSSH 7.8p1 changes

In message <e84b7b4a-89ab-2ad9-ac3a-e08b8491e5cc_at_yuripv.net>, Yuri 
Pankov write
s:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --NAG3HGfiwhsHyGq3aNdsIv1NzTEMODbUH
> Content-Type: multipart/mixed; boundary="c7yUHUJpZYpJqOrOWLAb4sE3Rmh2alrdi";
>  protected-headers="v1"
> From: Yuri Pankov <yuripv_at_yuripv.net>
> To: Cy Schubert <Cy.Schubert_at_cschubert.com>
> Cc: Mark Peek <mp_at_freebsd.org>, Enji Cooper <yaneurabeya_at_gmail.com>,
>  Warner Losh <imp_at_bsdimp.com>, =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?=
>  <des_at_freebsd.org>, freebsd-current <current_at_freebsd.org>
> Message-ID: <e84b7b4a-89ab-2ad9-ac3a-e08b8491e5cc_at_yuripv.net>
> Subject: Re: workaround for VMware WS NAT bug triggered by OpenSSH 7.8p1
>  changes
> References: <201812222009.wBMK9H5T050103_at_slippy.cwsent.com>
> In-Reply-To: <201812222009.wBMK9H5T050103_at_slippy.cwsent.com>
>
> --c7yUHUJpZYpJqOrOWLAb4sE3Rmh2alrdi
> Content-Type: text/plain; charset=utf-8
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> Cy Schubert wrote:
> > In message <913730b6-c6f0-60b8-a589-e89e872b7f42_at_yuripv.net>, Yuri=20
> > Pankov write
> > s:
> >> Yuri Pankov <yuripv_at_yuripv.net> wrote:
> >>> In-Reply-To: <CAGGgMJf45vkNY6o6-in+kiAFHxsFZpKBc4Oa6qiCFnzKnRjk1g_at_mai=
>
> > l.gmail.
> >>> com>
> >>> Mark Peek wrote:
> >>>> On Fri, Dec 21, 2018 at 9:30 PM Enji Cooper <yaneurabeya_at_gmail.com>
> >  wro=3D
> >>> te:
> >>>> =3D20
> >>>>>
> >>>>>> On Dec 21, 2018, at 17:48, Yuri Pankov <yuripv_at_yuripv.net> wrote:
> >>>>>>
> >>>>>> Mark Peek wrote:
> >>>>>>> Thanks for the cc:. I forwarded the original report on to an=20
> > interna=3D
> >>> l
> >>>>>>> VMware desktop product contact.
> >>>>>>
> >>>>>> Thank you.
> >>>>>>
> >>>>>>> What version of Workstation or Fusion is this occurring on? I=20
> > saw
> >>>>>>> Workstation 14 mentioned but curious if it occurs on=20
> > Workstation 15
> >>>>>>> (latest).
> >>>>>>
> >>>>>> Running the latest available for download: 15.0.2 build-10952284.
> >>>>>
> >>>>> This is affecting me on VMware Fusion 11.0.1-11.0.2. I know it=20
> > wasn=3DE2=3D
> >>> =3D80=3D99t
> >>>>> affecting me on 10.x. I didn=3DE2=3D80=3D99t install 11.0.0, so I=20
> > don=3DE2=3D80=3D99=3D
> >>> t know if it
> >>>>> affects that version...
> >>>>>
> >>>>> Thanks so much!
> >>>>>
> >>>>> -Enji
> >>>> =3D20
> >>>> =3D20
> >>>> BTW, there appears to be a workaround here using -o=20
> > 'IPQoS=3D3Dthroughput=3D
> >>> '
> >>>> (untested by me). I've seen the issue forwarded internally but no=20
> > furth=3D
> >>> er
> >>>> discussions yet.
> >>>> =3D20
> >>>> https://communities.vmware.com/thread/590825
> >>
> >> Yes, that's exactly what the patch attached to original message does i=
> f
> >> we are running as a VMware guest.  The workaround is known and it work=
> s,
> >> but it's not immediately clear and I just wanted it to be the default
> >> for the time being.
> >=20
> > The patch assumes VMWARE_GUEST_WORKAROUND unconditionally. Is this=20
> > intended?
>
> It's the added code that is ifdef'ed VMWARE_GUEST_WORKAROUND, so it can
> be ripped out easily when no longer needed, and yes, it's enabled
> unconditionally for now.  And the check itself is if 'kern.vm_guest'
> reports 'vmware'.

It doesn't look that conditional to me.

diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 614cc7627fc5..023fa4a55be9 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
_at__at_ -37,6 +37,9 _at__at_ LIBADD+=	crypto
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
 .endif
 
+# Workaround VMware Workstation NAT bug
+CFLAGS+=-DVMWARE_GUEST_WORKAROUND
+
 .include <bsd.prog.mk>
 
 .PATH:	${SSHDIR}


-- 
Cheers,
Cy Schubert <Cy.Schubert_at_cschubert.com>
FreeBSD UNIX:  <cy_at_FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.