builtin: support uid/gid config for binfs app
Implement I_SUID/I_SGID feature for binfs in the POSIX compliant way. If set-user-ID bit is set in the file permissions, then the effective user ID of process shall be set to UID of the new process image file. test case: hello example emulates to set uid and file set-user-ID bit, and call geteuid and getegid API. UID = 2000 GID = 3000 MODE = 06555 nsh> ls -l /bin/hello -r-sr-sr-x 2000 3000 0 hello nsh> hello geteuid:2000 getegid:3000 Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>
This commit is contained in:
parent
5accd7c146
commit
903e87a7bd
@ -106,6 +106,12 @@ static int builtin_loadbinary(FAR struct binary_s *binp,
|
||||
binp->entrypt = builtin->main;
|
||||
binp->stacksize = builtin->stacksize;
|
||||
binp->priority = builtin->priority;
|
||||
#ifdef CONFIG_SCHED_USER_IDENTITY
|
||||
binp->uid = builtin->uid;
|
||||
binp->gid = builtin->gid;
|
||||
binp->mode = builtin->mode;
|
||||
#endif
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
@ -469,6 +469,7 @@ static int binfs_stat(struct inode *mountpt,
|
||||
const char *relpath, struct stat *buf)
|
||||
{
|
||||
finfo("Entry\n");
|
||||
int index;
|
||||
|
||||
/* The requested directory must be the volume-relative "root" directory */
|
||||
|
||||
@ -476,7 +477,8 @@ static int binfs_stat(struct inode *mountpt,
|
||||
{
|
||||
/* Check if there is a file with this name. */
|
||||
|
||||
if (builtin_isavail(relpath) < 0)
|
||||
index = builtin_isavail(relpath);
|
||||
if (index < 0)
|
||||
{
|
||||
return -ENOENT;
|
||||
}
|
||||
@ -484,6 +486,12 @@ static int binfs_stat(struct inode *mountpt,
|
||||
/* It's a execute-only file name */
|
||||
|
||||
buf->st_mode = S_IFREG | S_IXOTH | S_IXGRP | S_IXUSR;
|
||||
|
||||
#ifdef CONFIG_SCHED_USER_IDENTITY
|
||||
buf->st_uid = builtin_getuid(index);
|
||||
buf->st_gid = builtin_getgid(index);
|
||||
buf->st_mode |= builtin_getmode(index);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -40,6 +40,11 @@ struct builtin_s
|
||||
int priority; /* Use: SCHED_PRIORITY_DEFAULT */
|
||||
int stacksize; /* Desired stack size */
|
||||
main_t main; /* Entry point: main(int argc, char *argv[]) */
|
||||
#ifdef CONFIG_SCHED_USER_IDENTITY
|
||||
uid_t uid; /* File owner user identity */
|
||||
gid_t gid; /* File owner group identity */
|
||||
int mode; /* File mode added to */
|
||||
#endif
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
@ -171,6 +176,64 @@ FAR const char *builtin_getname(int index);
|
||||
|
||||
FAR const struct builtin_s *builtin_for_index(int index);
|
||||
|
||||
#ifdef CONFIG_SCHED_USER_IDENTITY
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getuid
|
||||
*
|
||||
* Description:
|
||||
* Returns file uid of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid uid for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
uid_t builtin_getuid(int index);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getgid
|
||||
*
|
||||
* Description:
|
||||
* Returns file gid of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid gid for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
gid_t builtin_getgid(int index);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getmode
|
||||
*
|
||||
* Description:
|
||||
* Returns file mode of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid mode for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int builtin_getmode(int index);
|
||||
|
||||
#endif
|
||||
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
@ -28,6 +28,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||
CSRCS += lib_builtin_setlist.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SCHED_USER_IDENTITY),y)
|
||||
CSRCS += lib_builtin_getuid.c lib_builtin_getgid.c lib_builtin_getmode.c
|
||||
endif
|
||||
|
||||
# Hook the builtin subdirectory into the build
|
||||
|
||||
DEPPATH += --dep-path builtin
|
||||
|
63
libs/libc/builtin/lib_builtin_getgid.c
Normal file
63
libs/libc/builtin/lib_builtin_getgid.c
Normal file
@ -0,0 +1,63 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/builtin/lib_builtin_getgid.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <nuttx/lib/builtin.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getgid
|
||||
*
|
||||
* Description:
|
||||
* Returns file gid of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid gid for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
gid_t builtin_getgid(int index)
|
||||
{
|
||||
FAR const struct builtin_s *builtin;
|
||||
|
||||
builtin = builtin_for_index(index);
|
||||
|
||||
if (builtin != NULL)
|
||||
{
|
||||
return builtin->gid;
|
||||
}
|
||||
|
||||
/* Return group user identity 'root' with a gid value of 0. */
|
||||
|
||||
return 0;
|
||||
}
|
63
libs/libc/builtin/lib_builtin_getmode.c
Normal file
63
libs/libc/builtin/lib_builtin_getmode.c
Normal file
@ -0,0 +1,63 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/builtin/lib_builtin_getmode.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <nuttx/lib/builtin.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getmode
|
||||
*
|
||||
* Description:
|
||||
* Returns file mode of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid mode for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int builtin_getmode(int index)
|
||||
{
|
||||
FAR const struct builtin_s *builtin;
|
||||
|
||||
builtin = builtin_for_index(index);
|
||||
|
||||
if (builtin != NULL)
|
||||
{
|
||||
return builtin->mode;
|
||||
}
|
||||
|
||||
/* Return the default mode value of 0. */
|
||||
|
||||
return 0;
|
||||
}
|
63
libs/libc/builtin/lib_builtin_getuid.c
Normal file
63
libs/libc/builtin/lib_builtin_getuid.c
Normal file
@ -0,0 +1,63 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/builtin/lib_builtin_getuid.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <nuttx/lib/builtin.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: builtin_getuid
|
||||
*
|
||||
* Description:
|
||||
* Returns file uid of the application at 'index' in the table
|
||||
* of built-in applications.
|
||||
*
|
||||
* Input Parameters:
|
||||
* index - From 0 and on ...
|
||||
*
|
||||
* Returned Value:
|
||||
* Returns valid uid for app if index is valid.
|
||||
* Otherwise 0 is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
uid_t builtin_getuid(int index)
|
||||
{
|
||||
FAR const struct builtin_s *builtin;
|
||||
|
||||
builtin = builtin_for_index(index);
|
||||
|
||||
if (builtin != NULL)
|
||||
{
|
||||
return builtin->uid;
|
||||
}
|
||||
|
||||
/* Return user identity 'root' with a uid value of 0. */
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user