From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maksim Kokryashkin <max.kokryashkin@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit] Limit path length passed to C library loader. Date: Fri, 17 Mar 2023 14:17:45 +0300 [thread overview] Message-ID: <ZBQTPx3gymbZb862@root> (raw) In-Reply-To: <20230316161720.78669-1-max.kokryashkin@gmail.com> Hi, Maksim! Thanks for the patch! LGTM, except a few minor nits regarding the commit message and the comment. On 16.03.23, Maksim Kokryashkin wrote: > From: Mike Pall <mike> > > (cherry-picked from commit 90e65514dda3994253c1e3007f63da7ace8f6b7b) > > C library loader uses `dlopen` under the hood, which fails, if Typo: s/C library loader/The C library loader/ > provided library path is longer than PATH_MAX. PATH_MAX is > 4096 bytes by default, so a corresponsing check is added to Typo: s/corresponsing/corresponding/ > `ll_loadfunc`. > > Maxim Kokryashkin: > * added the description and the test for the problem > > Part of tarantool/tarantool#8069 > --- > Side note: Still no adequate constants like PATH_MAX... > Side note: There is no test for successfull loadlib, since > there is one in the PUC-Rio suite. > > Branch: https://github.com/tarantool/luajit/tree/fckxorg/c-library-path-length > PR: https://github.com/tarantool/tarantool/pull/8449 > > src/lib_package.c | 7 ++++++- > test/tarantool-tests/c-library-path-length.test.lua | 13 +++++++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > create mode 100644 test/tarantool-tests/c-library-path-length.test.lua > > diff --git a/src/lib_package.c b/src/lib_package.c > index 8573b9f9..67959a10 100644 > --- a/src/lib_package.c > +++ b/src/lib_package.c > @@ -215,7 +215,12 @@ static const char *mksymname(lua_State *L, const char *modname, > > static int ll_loadfunc(lua_State *L, const char *path, const char *name, int r) > { > - void **reg = ll_register(L, path); > + void **reg; > + if (strlen(path) >= 4096) { Side note: Why don't just use PATH_MAX here? AFAIK, it may be less than 4096 bytes. Just complaining. > + lua_pushliteral(L, "path too long"); > + return PACKAGE_ERR_LIB; > + } > + reg = ll_register(L, path); > if (*reg == NULL) *reg = ll_load(L, path, (*name == '*')); > if (*reg == NULL) { > return PACKAGE_ERR_LIB; /* Unable to load library. */ > diff --git a/test/tarantool-tests/c-library-path-length.test.lua b/test/tarantool-tests/c-library-path-length.test.lua > new file mode 100644 > index 00000000..11dd0cf4 > --- /dev/null > +++ b/test/tarantool-tests/c-library-path-length.test.lua > @@ -0,0 +1,13 @@ > +local tap = require('tap') > +local test = tap.test('c-library-path-length') > +test:plan(2) > + > +-- It doesn't really matter how long that string is, if it is longer than 4096. Minor: comment line is longer than 66 symbols. > +local long_path = string.rep('/path', 1024) > +package.cpath = long_path > + > +local res, err = package.loadlib(long_path, 'func') > +test:ok(res == nil, 'loaded library with a too large path') > +test:like(err, 'path too long', 'incorrect error') > + > +os.exit(test:check() and 0 or 1) > -- > 2.37.1 (Apple Git-137.1) > -- Best regards, Sergey Kaplun
next prev parent reply other threads:[~2023-03-17 11:21 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-16 16:17 Maksim Kokryashkin via Tarantool-patches 2023-03-17 11:17 ` Sergey Kaplun via Tarantool-patches [this message] 2023-03-17 12:54 ` Maxim Kokryashkin via Tarantool-patches 2023-03-30 17:36 ` Igor Munkin via Tarantool-patches 2023-05-25 6:16 ` Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ZBQTPx3gymbZb862@root \ --to=tarantool-patches@dev.tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit] Limit path length passed to C library loader.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox