Skip to content

fix: resolve compilation warnings #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YangQi0408 wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −71
Open

fix: resolve compilation warnings #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kernel/linux/include/linux/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* required ordering.
*/

#ifndef READ_ONCE
#define READ_ONCE(x) \
({ \
union \
Expand All @@ -33,13 +34,16 @@
__read_once_size(&(x), __u.__c, sizeof(x)); \
__u.__val; \
})
#endif

#ifndef WRITE_ONCE
#define WRITE_ONCE(x, val) \
({ \
typeof(x) __val = (val); \
__write_once_size(&(x), &__val, sizeof(__val)); \
__val; \
})
#endif

/*
* Prevent the compiler from merging or refetching accesses. The compiler
Expand Down
94 changes: 23 additions & 71 deletions kernel/patch/android/userd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ static const struct trusted_manager_entry trusted_managers[] = {
};

static uid_t trusted_manager_uid = TRUSTED_MANAGER_UID_INVALID;
static int global_pkg_pos = 0;


static const char ORIGIN_RC_FILES[][64] = {
"/system/etc/init/hw/init.rc",
Expand Down Expand Up @@ -155,21 +153,7 @@ static const void *kernel_read_file(const char *path, loff_t *len)
return data;
}

static int path_has_suffix(const char *path, const char *suffix)
{
size_t path_len;
size_t suffix_len;
if (!path || !suffix) return 0;
path_len = strlen(path);
suffix_len = strlen(suffix);
if (path_len < suffix_len) return 0;
return strcmp(path + path_len - suffix_len, suffix) == 0;
}

static int path_is_exact(const char *path, const char *target)
{
return path && target && strcmp(path, target) == 0;
}

static int read_le32(struct file *fp, loff_t *pos, uint32_t *out)
{
Expand Down Expand Up @@ -258,38 +242,6 @@ static int apk_sig_block_matches_trusted_digest(struct file *fp, uint32_t *size4
return 1;
}

static int apk_has_v1_signature_file(struct file *fp)
{
static const char manifest[] = "META-INF/MANIFEST.MF";
struct zip_entry_header header;
loff_t pos = 0;

while (kernel_read(fp, &header, sizeof(header), &pos) == sizeof(header)) {
if (header.signature != 0x04034b50u) {
return 0;
}

if (header.file_name_length == sizeof(manifest) - 1) {
char file_name[sizeof(manifest)];
if (kernel_read(fp, file_name, header.file_name_length, &pos) != header.file_name_length) {
return 0;
}
file_name[header.file_name_length] = '\0';
if (strncmp(file_name, manifest, sizeof(manifest) - 1) == 0) {
return 1;
}
} else if (skip_bytes(&pos, header.file_name_length)) {
return 0;
}

if (skip_bytes(&pos, (uint64_t)header.extra_field_length + header.compressed_size)) {
return 0;
}
}

return 0;
}

static int apk_matches_trusted_signature(const char *path, const uint8_t *expected_digest)
{
int i;
Expand Down Expand Up @@ -566,9 +518,9 @@ static bool apk_inner_actor(struct dir_context *dctx,
return false;
}

static int apk_inner_actor_int(struct dir_context *dctx,
const char *name, int namelen,
loff_t offset, u64 ino, unsigned int d_type)
static bool apk_inner_actor_int(struct dir_context *dctx,
const char *name, int namelen,
loff_t offset, u64 ino, unsigned int d_type)
{
struct apk_inner_ctx *ctx =
container_of(dctx, struct apk_inner_ctx, dctx);
Expand All @@ -578,41 +530,41 @@ static int apk_inner_actor_int(struct dir_context *dctx,
static const char base_apk[] = "/base.apk";

if (!ctx || !ctx->result)
return 1;
return true;

if (ctx->found)
return 1;
return true;

pkg = ctx->package;


if (!pkg || !pkg[0])
return 0;
return false;

len = strnlen(pkg, 128);

if ((size_t)namelen <= len)
return 0;
return false;

if (memcmp(name, pkg, len) != 0)
return 0;
return false;

if (name[len] != '-')
return 0;
return false;

outer_len = strlen(ctx->outer_dir);
path_len = outer_len + namelen + sizeof(base_apk);

if (path_len >= ctx->result_len)
return 0;
return false;

memcpy(ctx->result, ctx->outer_dir, outer_len);
memcpy(ctx->result + outer_len, name, namelen);
memcpy(ctx->result + outer_len + namelen,
base_apk, sizeof(base_apk));

ctx->found = 1;
return 1;
return true;
}

/* Outer callback: scan /data/app/ for ~~* scramble directories, then descend */
Expand Down Expand Up @@ -679,42 +631,42 @@ static bool apk_outer_actor(struct dir_context *dctx,
vfree(inner);
return true;
}
/* https://elixir.bootlin.com/linux/v6.0.19/source/include/linux/fs.h#L2049
// https://elixir.bootlin.com/linux/v6.0.19/source/include/linux/fs.h#L2049
/* Note: the return value semantics of the actor function changed in Linux 6.1:
* true to continue iterating, false to stop -> 0 to continue, nonzero to stop.
* We support both versions for compatibility with a wider range of kernels.
*/
static int apk_outer_actor_int(struct dir_context *dctx,
const char *name, int namelen,
loff_t offset, u64 ino, unsigned int d_type)
static bool apk_outer_actor_int(struct dir_context *dctx,
const char *name, int namelen,
loff_t offset, u64 ino, unsigned int d_type)
{
struct apk_outer_ctx *ctx = container_of(dctx, struct apk_outer_ctx, dctx);
struct apk_inner_ctx *inner;
struct file *inner_dir;
int len;

if (!ctx)
return 1;
return true;

if (ctx->found)
return 1;
return true;

if (namelen < 2 || name[0] != '~' || name[1] != '~')
return 0;
return false;

len = snprintf(ctx->inner_path, ctx->inner_path_len,
"/data/app/%.*s/", namelen, name);
if (len <= 0 || len >= (int)ctx->inner_path_len)
return 0;
return false;

inner_dir = filp_open(ctx->inner_path, O_RDONLY | O_NOFOLLOW, 0);
if (IS_ERR(inner_dir))
return 0;
return false;

inner = vmalloc(sizeof(*inner));
if (!inner) {
filp_close(inner_dir, 0);
return 0;
return false;
}
memset(inner, 0, sizeof(*inner));
if (kver >= VERSION(6, 1, 0)) {
Expand All @@ -734,11 +686,11 @@ static int apk_outer_actor_int(struct dir_context *dctx,
if (inner->found) {
ctx->found = 1;
vfree(inner);
return 1;
return true;
}

vfree(inner);
return 0;
return false;
}

static int find_trusted_manager_apk_path(char *apk_path,
Expand Down