[devel] [PATCH hasher-priv v1 1/3] caller.c
Arseny Maslennikov
ar на cs.msu.ru
Чт Сен 17 16:55:15 MSK 2020
> On Fri, Dec 13, 2019 at 12:42:03PM +0100, Alex Gladkov wrote:
> > diff --git a/hasher-priv/caller.c b/hasher-priv/caller.c
> > index e83084a..031ddef 100644
> > --- a/hasher-priv/caller.c
> > +++ b/hasher-priv/caller.c
> > @@ -19,62 +19,67 @@
> >
> > #include "priv.h"
> > #include "xmalloc.h"
> > +#include "logging.h"
> >
> > -const char *caller_user, *caller_home;
> > -uid_t caller_uid;
> > -gid_t caller_gid;
> > +char *caller_user = NULL;
> > +char *caller_home = NULL;
> > +uid_t caller_uid;
> > +gid_t caller_gid;
> >
> > /*
> > * Initialize caller_user, caller_uid, caller_gid and caller_home.
> > */
> > -void
> > -init_caller_data(void)
> > +int
> > +init_caller_data(uid_t uid, gid_t gid)
> > {
> > - const char *logname;
> > struct passwd *pw = 0;
> >
> > - caller_uid = getuid();
> > - if (caller_uid < MIN_CHANGE_UID)
> > - error(EXIT_FAILURE, 0, "caller has invalid uid: %u",
> > - caller_uid);
> > -
> > - caller_gid = getgid();
> > - if (caller_gid < MIN_CHANGE_GID)
> > - error(EXIT_FAILURE, 0, "caller has invalid gid: %u",
> > - caller_gid);
> > -
> > - if ((logname = getenv("LOGNAME")))
> > - if (!*logname || strchr(logname, ':'))
> > - logname = 0;
> > -
> > - if (logname)
> > - {
> > - pw = getpwnam(logname);
> > - if (caller_uid != pw->pw_uid || caller_gid != pw->pw_gid)
> > - pw = 0;
> > + caller_uid = uid;
> > + if (caller_uid < MIN_CHANGE_UID) {
> > + err("caller has invalid uid: %u", caller_uid);
> > + return -1;
> > + }
> > +
> > + caller_gid = gid;
> > + if (caller_gid < MIN_CHANGE_GID) {
> > + err("caller has invalid gid: %u", caller_gid);
> > + return -1;
> > }
> >
> > - if (!pw)
> > - pw = getpwuid(caller_uid);
> > + pw = getpwuid(caller_uid);
> >
> > - if (!pw || !pw->pw_name)
> > - error(EXIT_FAILURE, 0, "caller lookup failure");
> > + if (!pw || !pw->pw_name) {
> > + err("caller lookup failure");
> > + return -1;
> > + }
> >
> > caller_user = xstrdup(pw->pw_name);
> >
> > - if (caller_uid != pw->pw_uid)
> > - error(EXIT_FAILURE, 0, "caller %s: uid mismatch",
> > - caller_user);
> > + if (caller_uid != pw->pw_uid) {
> > + err("caller %s: uid mismatch", caller_user);
> > + return -1;
> > + }
> >
> > - if (caller_gid != pw->pw_gid)
> > - error(EXIT_FAILURE, 0, "caller %s: gid mismatch",
> > - caller_user);
> > + if (caller_gid != pw->pw_gid) {
> > + err("caller %s: gid mismatch", caller_user);
> > + return -1;
> > + }
> >
> > errno = 0;
> > if (pw->pw_dir && *pw->pw_dir)
> > caller_home = canonicalize_file_name(pw->pw_dir);
> >
> > - if (!caller_home || !*caller_home)
> > - error(EXIT_FAILURE, errno, "caller %s: invalid home",
> > - caller_user);
> > + if (!caller_home || !*caller_home) {
> > + err("caller %s: invalid home: %m", caller_user);
> > + return -1;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +void
> > +free_caller_data(void)
> > +{
> > + free(caller_user);
> > + free(caller_home);
> > }
Eeeh.
Since I did not have any comments about this file, I believe this file
is OK. Sorry for the noise.
----------- следующая часть -----------
Было удалено вложение не в текстовом формате...
Имя : signature.asc
Тип : application/pgp-signature
Размер : 833 байтов
Описание: отсутствует
Url : <http://lists.altlinux.org/pipermail/devel/attachments/20200917/b8dbff60/attachment.bin>
Подробная информация о списке рассылки Devel