From owner-svn-soc-all@FreeBSD.ORG Fri Jul 18 10:35:40 2014 Return-Path: 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 84978837 for ; Fri, 18 Jul 2014 10:35:40 +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 7150723DB for ; Fri, 18 Jul 2014 10:35:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6IAZedv047587 for ; Fri, 18 Jul 2014 10:35:40 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6IAZdfW047380 for svn-soc-all@FreeBSD.org; Fri, 18 Jul 2014 10:35:39 GMT (envelope-from op@FreeBSD.org) Date: Fri, 18 Jul 2014 10:35:39 GMT Message-Id: <201407181035.s6IAZdfW047380@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: r271074 - in soc2014/op/freebsd-base/sys: conf 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 10:35:40 -0000 Author: op Date: Fri Jul 18 10:35:39 2014 New Revision: 271074 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271074 Log: KSP: rename ELF sets Signed-off-by: Oliver Pinter git: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch Modified: soc2014/op/freebsd-base/sys/conf/ldscript.amd64 soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Modified: soc2014/op/freebsd-base/sys/conf/ldscript.amd64 ============================================================================== --- soc2014/op/freebsd-base/sys/conf/ldscript.amd64 Fri Jul 18 10:03:14 2014 (r271073) +++ soc2014/op/freebsd-base/sys/conf/ldscript.amd64 Fri Jul 18 10:35:39 2014 (r271074) @@ -30,10 +30,10 @@ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } - .rel.set_ksp_kpatch_set : { *(.rel.set_ksp_kpatch_set) } - .rela.set_ksp_kpatch_set : { *(.rela.set_ksp_kpatch_set) } - .rel.set_ksp_kpatch_patch_set : { *(.rel.set_ksp_kpatch_patch_set) } - .rela.set_ksp_kpatch_patch_set : { *(.rela.set_ksp_kpatch_patch_set) } + .rel.set_selfpatch_set : { *(.rel.set_selfpatch_set) } + .rela.set_selfpatch_set : { *(.rela.set_selfpatch_set) } + .rel.set_selfpatch_patch_set : { *(.rel.set_selfpatch_patch_set) } + .rela.set_selfpatch_patch_set : { *(.rela.set_selfpatch_patch_set) } .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } .rel.ctors : { *(.rel.ctors) } @@ -144,17 +144,17 @@ .got : { *(.got) } . = DATA_SEGMENT_RELRO_END (24, .); .got.plt : { *(.got.plt) } - set_ksp_kpatch_set : + set_selfpatch_set : { - PROVIDE ( __start_set_ksp_kpatch_set = . ); - KEEP (*(set_ksp_kpatch_set)); - PROVIDE ( __stop_set_ksp_kpatch_set = . ); + PROVIDE ( __start_set_selfpatch_set = . ); + KEEP (*(set_selfpatch_set)); + PROVIDE ( __stop_set_selfpatch_set = . ); } - set_ksp_kpatch_patch_set : + set_selfpatch_patch_set : { - PROVIDE ( __start_set_ksp_kpatch_patch_set = . ); - KEEP (*(set_ksp_kpatch_patch_set)); - PROVIDE ( __stop_set_ksp_kpatch_patch_set = . ); + PROVIDE ( __start_set_selfpatch_patch_set = . ); + KEEP (*(set_selfpatch_patch_set)); + PROVIDE ( __stop_set_selfpatch_patch_set = . ); } .data : { Modified: soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c ============================================================================== --- soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Fri Jul 18 10:03:14 2014 (r271073) +++ soc2014/op/freebsd-base/sys/kern/kern_selfpatch.c Fri Jul 18 10:35:39 2014 (r271074) @@ -49,8 +49,8 @@ printf(__VA_ARGS__); \ } -extern struct lf_selfpatch __start_set_ksp_kpatch_set[]; -extern struct lf_selfpatch __stop_set_ksp_kpatch_set[]; +extern struct lf_selfpatch __start_set_selfpatch_set[]; +extern struct lf_selfpatch __stop_set_selfpatch_set[]; static int selfpatch_debug=1; SYSCTL_INT(_debug, OID_AUTO, selfpatch_debug, CTLFLAG_RWTUN, @@ -110,17 +110,17 @@ if (lf != NULL) { DBG("module: %s\n", lf->filename); - ret = linker_file_lookup_set(lf, "ksp_kpatch_set", &start, &stop, NULL); + ret = linker_file_lookup_set(lf, "selfpatch_set", &start, &stop, NULL); if (ret != 0) { - DBG("failed to locate ksp_kpatch_set\n"); + DBG("failed to locate selfpatch_set\n"); return; } DBG("start: %p stop: %p\n", start, stop); } else { DBG("kernel patching\n"); - DBG("start: %p stop: %p\n", __start_set_ksp_kpatch_set, __stop_set_ksp_kpatch_set); - start = __stop_set_ksp_kpatch_set; - stop = __stop_set_ksp_kpatch_set; + DBG("start: %p stop: %p\n", __start_set_selfpatch_set, __stop_set_selfpatch_set); + start = __stop_set_selfpatch_set; + stop = __stop_set_selfpatch_set; } count = stop - start;