Merge pull request #962 from sm00th/fixup-section-fix

Update fixup-section patches
This commit is contained in:
Josh Poimboeuf 2019-05-15 09:41:02 -05:00 committed by GitHub
commit 7aa371aa37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View File

@ -1,12 +1,12 @@
diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
--- src.orig/fs/readdir.c 2017-09-22 15:27:21.658056010 -0400
+++ src/fs/readdir.c 2017-09-22 15:27:26.378075555 -0400
@@ -166,6 +166,8 @@ static int filldir(void * __buf, const c
diff --git a/fs/readdir.c b/fs/readdir.c
index febd02dfbe2d..064db7bd70d0 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -176,6 +176,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
goto efault;
}
dirent = buf->current_dir;
+ if (dirent->d_ino == 12345678)
+ printk("kpatch-test: testing .fixup section changes\n");
+ asm("nop");
if (__put_user(d_ino, &dirent->d_ino))
goto efault;
if (__put_user(reclen, &dirent->d_reclen))

View File

@ -1,12 +1,12 @@
diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
--- src.orig/fs/readdir.c 2016-12-15 19:55:39.196000000 +0000
+++ src/fs/readdir.c 2016-12-15 19:56:25.868000000 +0000
@@ -173,6 +173,8 @@ static int filldir(struct dir_context *c
diff --git a/fs/readdir.c b/fs/readdir.c
index ced679179cac..7fb338324582 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -173,6 +173,7 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
goto efault;
}
dirent = buf->current_dir;
+ if (dirent->d_ino == 12345678)
+ printk("kpatch-test: testing .fixup section changes\n");
+ asm("nop");
if (__put_user(d_ino, &dirent->d_ino))
goto efault;
if (__put_user(reclen, &dirent->d_reclen))