[PATCH v3 3/3] fhandler/proc.cc: use wincap.has_user_shstk

[Corinna Vinschen]

On Jun 16 10:28, Corinna Vinschen wrote:
> Hi Brain,
> 
> 
> thanks for the patch. Sorry to hassle you again, but I forget to mention
> this yesterday and I'm still only partially available.  So, here goes:
> 
> It would be really great if you could resend your patchset with three
> changes in the commit message:
> 
> - For obvious reasons, the message text in your cover message won't make
>   it into the git repo.  However, the commit messages in git should
>   reflect why the change was made, so a future interested reader has
>   a chance to understand why a change was made.

Along these lines, given this patch fixes another one, the message text
should ideally outline what was wrong with the original patch and that
the new method doing things fixes it.

> 
> - As I already mentioned a couple of times on this list (but not
>   lately), it would be great if you could always add a "Signed-off-by:"
>   line.
> 
> - Also, given this patch fixes an earlier patch, it should contain
>   a line
> 
>     Fixes: <12-digit-SHA1> ("commit headline")
> 
>   In this case, patch 3 of the series should contain
> 
>     Fixes: 41fdb869f998 ("fhandler/proc.cc(format_proc_cpuinfo): Add Linux 6.3 cpuinfo")
> 
> 
> Thanks,
> Corinna
> 
> 
> On Jun 15 18:16, Brian Inglis wrote:
> > ---
> >  winsup/cygwin/fhandler/proc.cc | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc
> > index 3c79762e0fbd..2eaf436dc122 100644
> > --- a/winsup/cygwin/fhandler/proc.cc
> > +++ b/winsup/cygwin/fhandler/proc.cc
> > @@ -1486,12 +1486,12 @@ format_proc_cpuinfo (void *, char *&destbuf)
> >  
> >  /*	  ftcprint (features1,  6, "split_lock_detect");*//* MSR_TEST_CTRL split lock */
> >  
> > -      /* cpuid 0x00000007 ecx & Windows [20]20H1/[20]2004+ */
> > -      if (maxf >= 0x00000007 && wincap.osname () >= "10.0"
> > -					 && wincap.build_number () >= 19041)
> > +      /* Windows [20]20H1/[20]2004/19041 user shadow stack */
> > +      if (maxf >= 0x00000007 && wincap.has_user_shstk ())
> >          {
> > +	  /* cpuid 0x00000007 ecx CET shadow stack */
> >  	  cpuid (&unused, &unused, &features1, &unused, 0x00000007, 0);
> > -	  ftcprint (features1,  7, "user_shstk");	/* "user shadow stack" */
> > +	  ftcprint (features1,  7, "user_shstk");	/* user shadow stack */
> >  	}
> >  
> >        /* cpuid 0x00000007:1 eax */
> > -- 
> > 2.39.0