From owner-svn-soc-all@FreeBSD.ORG  Fri Jul 18 10:03:15 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 323D5457
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 10:03:15 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F4E7213A
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 10:03:15 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6IA3ENe044490
 for <svn-soc-all@FreeBSD.org>; Fri, 18 Jul 2014 10:03:14 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6IA3E5q044322
 for svn-soc-all@FreeBSD.org; Fri, 18 Jul 2014 10:03:14 GMT
 (envelope-from op@FreeBSD.org)
Date: Fri, 18 Jul 2014 10:03:14 GMT
Message-Id: <201407181003.s6IA3E5q044322@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271073 - soc2014/op/freebsd-base/sys/kern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jul 2014 10:03:15 -0000

Author: op
Date: Fri Jul 18 10:03:14 2014
New Revision: 271073
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271073

Log:
  KSP: hook in lf_selfpatch in kldload and preload case
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch

Modified:
  soc2014/op/freebsd-base/sys/kern/kern_linker.c

Modified: soc2014/op/freebsd-base/sys/kern/kern_linker.c
==============================================================================
--- soc2014/op/freebsd-base/sys/kern/kern_linker.c	Fri Jul 18 10:03:03 2014	(r271072)
+++ soc2014/op/freebsd-base/sys/kern/kern_linker.c	Fri Jul 18 10:03:14 2014	(r271073)
@@ -53,6 +53,7 @@
 #include <sys/vnode.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
+#include <sys/selfpatch.h>
 
 #include <net/vnet.h>
 
@@ -420,6 +421,7 @@
 				return (error);
 			}
 			modules = !TAILQ_EMPTY(&lf->modules);
+			lf_selfpatch(lf);
 			linker_file_register_sysctls(lf);
 			linker_file_sysinit(lf);
 			lf->flags |= LINKER_FILE_LINKED;
@@ -1607,6 +1609,8 @@
 			    lf->filename);
 			goto fail;
 		}
+		/* XXXOP - linker_kernel_file double patched?*/
+		lf_selfpatch(lf);
 		linker_file_register_modules(lf);
 		if (linker_file_lookup_set(lf, "sysinit_set", &si_start,
 		    &si_stop, NULL) == 0)