android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: Fix compile error above 6.1

Browse Source
This commit is contained in:
weishu
2024-03-23 23:10:36 +08:00
parent 4adc9873a9
commit a5e3cab177
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/uid_observer.c
View File

@@ -90,8 +90,19 @@ struct my_dir_context {
int depth; int depth;
int *stop; int *stop;
}; };
// https://docs.kernel.org/filesystems/porting.html
// filldir_t (readdir callbacks) calling conventions have changed. Instead of returning 0 or -E... it returns bool now. false means "no more" (as -E... used to) and true - "keep going" (as 0 in old calling conventions). Rationale: callers never looked at specific -E... values anyway. -> iterate_shared() instances require no changes at all, all filldir_t ones in the tree converted.
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
#define FILLDIR_RETURN_TYPE bool
#define FILLDIR_ACTOR_CONTINUE true
#define FILLDIR_ACTOR_STOP false
#else
#define FILLDIR_RETURN_TYPE int
#define FILLDIR_ACTOR_CONTINUE 0
#define FILLDIR_ACTOR_STOP -EINVAL
#endif
int my_actor(struct dir_context *ctx, const char *name, int namelen, loff_t off, FILLDIR_RETURN_TYPE my_actor(struct dir_context *ctx, const char *name, int namelen, loff_t off,
u64 ino, unsigned int d_type) u64 ino, unsigned int d_type)
{ {
struct my_dir_context *my_ctx = struct my_dir_context *my_ctx =
@@ -101,18 +112,18 @@ int my_actor(struct dir_context *ctx, const char *name, int namelen, loff_t off,
if (!my_ctx) { if (!my_ctx) {
pr_err("Invalid context\n"); pr_err("Invalid context\n");
return -EINVAL; return FILLDIR_ACTOR_STOP;
} }
if (my_ctx->stop && *my_ctx->stop) { if (my_ctx->stop && *my_ctx->stop) {
return 1; return FILLDIR_ACTOR_STOP;
} }
if (!strncmp(name, "..", namelen) || !strncmp(name, ".", namelen)) if (!strncmp(name, "..", namelen) || !strncmp(name, ".", namelen))
return 0; // Skip "." and ".." return FILLDIR_ACTOR_CONTINUE; // Skip "." and ".."
dirpath = kmalloc(PATH_MAX, GFP_KERNEL); dirpath = kmalloc(PATH_MAX, GFP_KERNEL);
if (!dirpath) { if (!dirpath) {
return -ENOMEM; // Failed to obtain directory path return FILLDIR_ACTOR_STOP; // Failed to obtain directory path
} }
snprintf(dirpath, PATH_MAX, "%s/%.*s", my_ctx->parent_dir, namelen, snprintf(dirpath, PATH_MAX, "%s/%.*s", my_ctx->parent_dir, namelen,
name); name);
@@ -130,7 +141,7 @@ int my_actor(struct dir_context *ctx, const char *name, int namelen, loff_t off,
pr_err("Failed to open directory: %s, err: %d\n", pr_err("Failed to open directory: %s, err: %d\n",
dirpath, PTR_ERR(file)); dirpath, PTR_ERR(file));
kfree(dirpath); kfree(dirpath);
return PTR_ERR(file); return FILLDIR_ACTOR_STOP;
} }
iterate_dir(file, &sub_ctx.ctx); iterate_dir(file, &sub_ctx.ctx);
@@ -149,7 +160,7 @@ int my_actor(struct dir_context *ctx, const char *name, int namelen, loff_t off,
kfree(dirpath); kfree(dirpath);
} }
return 0; return FILLDIR_ACTOR_CONTINUE;
} }
void search_manager(const char *path, int depth, struct list_head *uid_data) void search_manager(const char *path, int depth, struct list_head *uid_data)