Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1369561 - Address misc. SnprintfLiteral correctness nits. r=jld, r=froydnj

Browse Source
This commit is contained in:
David Keeler 2017-09-15 14:47:54 -07:00
parent 49156443d9
commit 2a15781174
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
security/sandbox/linux/SandboxUtil.cpp
View File

@ -62,7 +62,6 @@ UnshareUserNamespace()
uid_t uid = getuid();
gid_t gid = getgid();
char buf[80];
size_t len;
if (syscall(__NR_unshare, CLONE_NEWUSER) != 0) {
return false;
@ -84,17 +83,21 @@ UnshareUserNamespace()
// current thread. However, CLONE_NEWUSER can be unshared only in a
// single-threaded process, so those are equivalent if we reach this
// point.
len = size_t(SprintfLiteral(buf, "%u %u 1\n", uid, uid));
MOZ_ASSERT(len < sizeof(buf));
if (!WriteStringToFile("/proc/self/uid_map", buf, len)) {
int len = SprintfLiteral(buf, "%u %u 1\n", uid, uid);
if (len >= int(sizeof(buf)) || len < 0) {
return false;
}
if (!WriteStringToFile("/proc/self/uid_map", buf, size_t(len))) {
MOZ_CRASH("Failed to write /proc/self/uid_map");
}
Unused << WriteStringToFile("/proc/self/setgroups", "deny", 4);
len = size_t(SprintfLiteral(buf, "%u %u 1\n", gid, gid));
MOZ_ASSERT(len < sizeof(buf));
if (!WriteStringToFile("/proc/self/gid_map", buf, len)) {
len = SprintfLiteral(buf, "%u %u 1\n", gid, gid);
if (len >= int(sizeof(buf)) || len < 0) {
return false;
}
if (!WriteStringToFile("/proc/self/gid_map", buf, size_t(len))) {
MOZ_CRASH("Failed to write /proc/self/gid_map");
}
return true;

2
xpcom/base/nsSystemInfo.cpp
View File

@ -706,7 +706,7 @@ nsSystemInfo::Init()
}
nsAutoCString secondaryLibrary;
if (gtkver_len > 0) {
if (gtkver_len > 0 && gtkver_len < int(sizeof(gtkver))) {
secondaryLibrary.Append(nsDependentCSubstring(gtkver, gtkver_len));
}