Page MenuHomeFreeBSD
Differential D26080

flua: Add a libjail module
ClosedPublic
Actions

Authored by freqlabs on Aug 16 2020, 4:31 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 12:12 PM
Unknown Object (File)
Thu, Mar 6, 2:56 AM
Unknown Object (File)
Feb 19 2025, 8:50 PM
Unknown Object (File)
Feb 18 2025, 10:55 PM
Unknown Object (File)
Feb 16 2025, 4:25 PM
Unknown Object (File)
Feb 14 2025, 12:13 PM
Unknown Object (File)
Feb 13 2025, 12:43 AM
Unknown Object (File)
Feb 12 2025, 8:10 PM
View All Files
Subscribers
emaste
imp
kevans
Contributor Reviews (src)

Details

Reviewers
kevans
emaste
Group Reviewers
manpages
Commits
rS367013: flua: Add a libjail module
Summary

libjail is pretty small, so it makes for a good proof of concept demonstrating how a system library can be wrapped to create a loadable Lua module for flua.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

freqlabs created this revision.Aug 16 2020, 4:31 AM
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptAug 16 2020, 4:31 AM
freqlabs requested review of this revision.Aug 16 2020, 4:31 AM
freqlabs planned changes to this revision.Aug 16 2020, 4:33 AM

I plan to add documentation and Lua code examples. And I should add $FreeBSD$ and unshebangify lib/flua/libjail/Makefile

imp added inline comments.Aug 16 2020, 4:59 AM
lib/Makefile
144

Does this really work? This should be controlled with a MK_ variables...

freqlabs added inline comments.Aug 16 2020, 3:28 PM
lib/Makefile
144

I took it from about 13 lines down where clang does something similar. The goal is to not build a lib32 compat version of the Lua modules. It does seem to be working.

freqlabs updated this revision to Diff 75882.Aug 17 2020, 12:48 AM
  • Add an example for the jail module
  • Add a 3lua manpage section, with intro(3lua) and jail(3lua)
  • Add __FBSDID to the jail module
  • Unshebangify lib/flua/libjail/Makefile
Herald added a reviewer: manpages. · View Herald TranscriptAug 17 2020, 12:48 AM
freqlabs updated this revision to Diff 77701.Sep 30 2020, 9:00 PM
freqlabs added reviewers: kevans, emaste.

Add 3lua section to contrib/mandoc/msec.in

kevans added a comment.Oct 4 2020, 10:23 PM

I'd eventually like to be able to iterate over running jails, but this isn't necessary for a first pass.

lib/flua/libjail/jail.3lua
1

Needs a SPDX tag

kevans added inline comments.Oct 13 2020, 2:04 AM
lib/flua/libjail/lua_jail.c
209

You'll want to deconst this, as it needs to be free()d after it's pushed to the stack.

kevans added a child revision: D26756: jail(3lua): add a jail.list() method.Oct 13 2020, 2:27 AM
freqlabs updated this revision to Diff 78257.Oct 15 2020, 7:21 AM

Incorporated feedback

freqlabs marked 3 inline comments as done.Oct 15 2020, 7:22 AM
kevans accepted this revision.Oct 16 2020, 12:38 AM
This revision is now accepted and ready to land.Oct 16 2020, 12:38 AM
freqlabs added a child revision: D25447: lib/flua: Add bindings for libifconfig.Oct 21 2020, 5:43 AM
bcr accepted this revision as: manpages.Oct 23 2020, 11:27 AM
kevans added inline comments.Oct 23 2020, 6:14 PM
lib/flua/libjail/lua_jail.c
237

make analyze points out that this is a dead store, due to reassignment in the impending loop.

kevans added a child revision: D26927: jail(3lua): add jail.attach()/jail.remove() methods.Oct 24 2020, 3:56 PM
Closed by commit rS367013: flua: Add a libjail module (authored by freqlabs). · Explain WhyOct 24 2020, 5:09 PM
This revision was automatically updated to reflect the committed changes.
freqlabs added a commit: rS367013: flua: Add a libjail module.
kevans removed a child revision: D26927: jail(3lua): add jail.attach()/jail.remove() methods.Oct 26 2020, 1:29 PM

Revision Contents
Changeset List

PathSize
1 line
contrib/
mandoc/
1 line
etc/
mtree/
4 lines
lib/
5 lines
flua/
5 lines
libjail/
16 lines
207 lines
391 lines
share/
examples/
4 lines
flua/
60 lines
man/
2 lines
man3lua/
7 lines
62 lines
usr.bin/
man/
1 line
2 lines

Diff 77701

View Options

Makefile.inc1

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Andrew Turner under
* sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
ENTRY(.rtld_start)
mov x19, x0 /* Put ps_strings in a callee-saved register */
mov x20, sp /* And the stack pointer */
sub x8, x20, #16 /* Make room for obj_main & exit proc */
mov sp, x8 /* Update the stack pointer */
adr x3, .Ldelta
ldr x2, [x3]
sub x1, x3, x2 /* Load the relocation delta */
adr x0, _DYNAMIC /* Load &_DYNAMIC */
bl reloc_non_plt_self
mov x0, x20 /* Pass the stack we were given to _rtld */
mov x1, sp /* exit_proc */
add x2, x1, #8 /* obj_main */
/* Good */
bl _rtld /* Call the loader */
mov x8, x0 /* Backup the entry point */
ldr x2, [sp] /* Load cleanup */
ldr x1, [sp, #8] /* Load obj_main */
mov x0, x19 /* Restore ps_strings */
mov sp, x20 /* Restore the stack pointer */
br x8 /* Jump to the entry point */
.Ldelta:
.word .
.word 0
END(.rtld_start)
/*
* uint64_t _rtld_tlsdesc(struct tlsdesc *);
*
* struct tlsdesc {
* uint64_t ptr;
* uint64_t data;
* };
*
* Returns the data.
*/
ENTRY(_rtld_tlsdesc)
ldr x0, [x0, #8]
RET
END(_rtld_tlsdesc)
View Options

contrib/mandoc/msec.in

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Andrew Turner under
* sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
ENTRY(.rtld_start)
mov x19, x0 /* Put ps_strings in a callee-saved register */
mov x20, sp /* And the stack pointer */
sub x8, x20, #16 /* Make room for obj_main & exit proc */
mov sp, x8 /* Update the stack pointer */
adr x3, .Ldelta
ldr x2, [x3]
sub x1, x3, x2 /* Load the relocation delta */
adr x0, _DYNAMIC /* Load &_DYNAMIC */
bl reloc_non_plt_self
mov x0, x20 /* Pass the stack we were given to _rtld */
mov x1, sp /* exit_proc */
add x2, x1, #8 /* obj_main */
/* Good */
bl _rtld /* Call the loader */
mov x8, x0 /* Backup the entry point */
ldr x2, [sp] /* Load cleanup */
ldr x1, [sp, #8] /* Load obj_main */
mov x0, x19 /* Restore ps_strings */
mov sp, x20 /* Restore the stack pointer */
br x8 /* Jump to the entry point */
.Ldelta:
.word .
.word 0
END(.rtld_start)
/*
* uint64_t _rtld_tlsdesc(struct tlsdesc *);
*
* struct tlsdesc {
* uint64_t ptr;
* uint64_t data;
* };
*
* Returns the data.
*/
ENTRY(_rtld_tlsdesc)
ldr x0, [x0, #8]
RET
END(_rtld_tlsdesc)
View Options

etc/mtree/BSD.usr.dist

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Andrew Turner under
* sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
ENTRY(.rtld_start)
mov x19, x0 /* Put ps_strings in a callee-saved register */
mov x20, sp /* And the stack pointer */
sub x8, x20, #16 /* Make room for obj_main & exit proc */
mov sp, x8 /* Update the stack pointer */
adr x3, .Ldelta
ldr x2, [x3]
sub x1, x3, x2 /* Load the relocation delta */
adr x0, _DYNAMIC /* Load &_DYNAMIC */
bl reloc_non_plt_self
mov x0, x20 /* Pass the stack we were given to _rtld */
mov x1, sp /* exit_proc */
add x2, x1, #8 /* obj_main */
/* Good */
bl _rtld /* Call the loader */
mov x8, x0 /* Backup the entry point */
ldr x2, [sp] /* Load cleanup */
ldr x1, [sp, #8] /* Load obj_main */
mov x0, x19 /* Restore ps_strings */
mov sp, x20 /* Restore the stack pointer */
br x8 /* Jump to the entry point */
.Ldelta:
.word .
.word 0
END(.rtld_start)
/*
* uint64_t _rtld_tlsdesc(struct tlsdesc *);
*
* struct tlsdesc {
* uint64_t ptr;
* uint64_t data;
* };
*
* Returns the data.
*/
ENTRY(_rtld_tlsdesc)
ldr x0, [x0, #8]
RET
END(_rtld_tlsdesc)
View Options

lib/Makefile

  • This file was added.
PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
/*-
* Copyright (c) 2014 The FreeBSD Foundation
* All rights reserved.
*
* This software was developed by Andrew Turner under
* sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
ENTRY(.rtld_start)
mov x19, x0 /* Put ps_strings in a callee-saved register */
mov x20, sp /* And the stack pointer */
sub x8, x20, #16 /* Make room for obj_main & exit proc */
mov sp, x8 /* Update the stack pointer */
adr x3, .Ldelta
ldr x2, [x3]
sub x1, x3, x2 /* Load the relocation delta */
adr x0, _DYNAMIC /* Load &_DYNAMIC */
bl reloc_non_plt_self
mov x0, x20 /* Pass the stack we were given to _rtld */
mov x1, sp /* exit_proc */
add x2, x1, #8 /* obj_main */
/* Good */
bl _rtld /* Call the loader */
mov x8, x0 /* Backup the entry point */
ldr x2, [sp] /* Load cleanup */
ldr x1, [sp, #8] /* Load obj_main */
mov x0, x19 /* Restore ps_strings */
mov sp, x20 /* Restore the stack pointer */
br x8 /* Jump to the entry point */
.Ldelta:
.word .
.word 0
END(.rtld_start)
/*
* uint64_t _rtld_tlsdesc(struct tlsdesc *);
*
* struct tlsdesc {
* uint64_t ptr;
* uint64_t data;
* };
*
* Returns the data.
*/
ENTRY(_rtld_tlsdesc)
ldr x0, [x0, #8]
RET
END(_rtld_tlsdesc)
View Options

lib/flua/Makefile

Loading...
View Options

lib/flua/libjail/Makefile

Loading...
View Options

lib/flua/libjail/jail.3lua

Loading...
View Options

lib/flua/libjail/lua_jail.c

Loading...
View Options

share/examples/Makefile

Loading...
View Options

share/examples/flua/jail.lua

Loading...
View Options

share/man/Makefile

Loading...
View Options

share/man/man3lua/Makefile

Loading...
View Options

share/man/man3lua/intro.3lua

Loading...
View Options

usr.bin/man/man.1

Loading...
View Options

usr.bin/man/man.sh

Loading...