0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-04 05:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Kernel: Don't disable interrupts to access the system hostname.

Browse source
This commit is contained in:
Andreas Kling 2019-02-07 10:29:26 +01:00
parent 458706c4cf
commit 2e663eda36
Notes: sideshowbarker 2024-07-19 15:50:30 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/2e663eda366
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Kernel/Process.cpp
View file

@ -33,18 +33,7 @@ static const dword default_userspace_stack_size = 65536;
static pid_t next_pid;
InlineLinkedList<Process>* g_processes;
static String* s_hostname;
static String& hostname_storage(InterruptDisabler&)
{
ASSERT(s_hostname);
return *s_hostname;
}
static String get_hostname()
{
InterruptDisabler disabler;
return hostname_storage(disabler).isolated_copy();
}
static Lock* s_hostname_lock;
CoolGlobals* g_cool_globals;
@ -56,6 +45,7 @@ void Process::initialize()
next_pid = 0;
g_processes = new InlineLinkedList<Process>;
s_hostname = new String("courage");
s_hostname_lock = new Lock;
Scheduler::initialize();
initialize_gui_statics();
}
@ -216,10 +206,10 @@ int Process::sys$gethostname(char* buffer, size_t size)
{
if (!validate_write(buffer, size))
return -EFAULT;
auto hostname = get_hostname();
if (size < (hostname.length() + 1))
LOCKER(*s_hostname_lock);
if (size < (s_hostname->length() + 1))
return -ENAMETOOLONG;
memcpy(buffer, hostname.characters(), size);
strcpy(buffer, s_hostname->characters());
return 0;
}
@ -1398,7 +1388,8 @@ int Process::sys$uname(utsname* buf)
strcpy(buf->release, "1.0-dev");
strcpy(buf->version, "FIXME");
strcpy(buf->machine, "i386");
strcpy(buf->nodename, get_hostname().characters());
LOCKER(*s_hostname_lock);
strncpy(buf->nodename, s_hostname->characters(), sizeof(utsname::nodename));
return 0;
}

10
Kernel/StdLib.cpp
View file

@ -40,6 +40,16 @@ void strcpy(char* dest, const char *src)
while ((*dest++ = *src++) != '\0');
}
char* strncpy(char* dest, const char* src, size_t n)
{
size_t i;
for (i = 0; i < n && src[i] != '\0'; ++i)
dest[i] = src[i];
for ( ; i < n; ++i)
dest[i] = '\0';
return dest;
}
void* memset(void* dest_ptr, byte c, dword n)
{
dword dest = (dword)dest_ptr;

1
Kernel/StdLib.h
View file

@ -6,6 +6,7 @@ extern "C" {
void memcpy(void*, const void*, dword);
void strcpy(char*, const char*);
char* strncpy(char*, const char*, size_t);
int strcmp(char const*, const char*);
size_t strlen(const char*);
void *memset(void*, byte, dword);