Author: markj
Date: Thu Apr  2 15:32:09 2020
New Revision: 359566
URL: https://svnweb.freebsd.org/changeset/base/359566

Log:
  MFC r359133:
  kern_dup(): Call filecaps_free_prep() in a write section.

Modified:
  stable/12/sys/kern/kern_descrip.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/kern_descrip.c
==============================================================================
--- stable/12/sys/kern/kern_descrip.c   Thu Apr  2 15:30:51 2020        
(r359565)
+++ stable/12/sys/kern/kern_descrip.c   Thu Apr  2 15:32:09 2020        
(r359566)
@@ -919,7 +919,6 @@ kern_dup(struct thread *td, u_int mode, int flags, int
        newfde = &fdp->fd_ofiles[new];
        delfp = newfde->fde_file;
 
-       oioctls = filecaps_free_prep(&newfde->fde_caps);
        nioctls = filecaps_copy_prep(&oldfde->fde_caps);
 
        /*
@@ -928,6 +927,7 @@ kern_dup(struct thread *td, u_int mode, int flags, int
 #ifdef CAPABILITIES
        seq_write_begin(&newfde->fde_seq);
 #endif
+       oioctls = filecaps_free_prep(&newfde->fde_caps);
        memcpy(newfde, oldfde, fde_change_size);
        filecaps_copy_finish(&oldfde->fde_caps, &newfde->fde_caps,
            nioctls);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to