diff options
Diffstat (limited to 'recipes-extended/glusterfs/files')
5 files changed, 59 insertions, 129 deletions
diff --git a/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch index 79a55b3..1cdccf9 100644 --- a/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch +++ b/recipes-extended/glusterfs/files/0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch | |||
@@ -72,11 +72,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
72 | cli/src/cli.h | 4 ++-- | 72 | cli/src/cli.h | 4 ++-- |
73 | 2 files changed, 5 insertions(+), 2 deletions(-) | 73 | 2 files changed, 5 insertions(+), 2 deletions(-) |
74 | 74 | ||
75 | diff --git a/cli/src/cli.c b/cli/src/cli.c | 75 | Index: glusterfs-11.1/cli/src/cli.c |
76 | index cb425c84b..2c96b7ae6 100644 | 76 | =================================================================== |
77 | --- a/cli/src/cli.c | 77 | --- glusterfs-11.1.orig/cli/src/cli.c |
78 | +++ b/cli/src/cli.c | 78 | +++ glusterfs-11.1/cli/src/cli.c |
79 | @@ -84,6 +84,9 @@ rpc_clnt_prog_t *cli_rpc_prog; | 79 | @@ -65,6 +65,9 @@ |
80 | 80 | ||
81 | extern struct rpc_clnt_program cli_prog; | 81 | extern struct rpc_clnt_program cli_prog; |
82 | 82 | ||
@@ -86,21 +86,3 @@ index cb425c84b..2c96b7ae6 100644 | |||
86 | static int | 86 | static int |
87 | glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx) | 87 | glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx) |
88 | { | 88 | { |
89 | diff --git a/cli/src/cli.h b/cli/src/cli.h | ||
90 | index 81f75a0b4..cd4db3dac 100644 | ||
91 | --- a/cli/src/cli.h | ||
92 | +++ b/cli/src/cli.h | ||
93 | @@ -40,8 +40,8 @@ enum argp_option_keys { | ||
94 | ARGP_PORT_KEY = 'p', | ||
95 | }; | ||
96 | |||
97 | -int cli_default_conn_timeout; | ||
98 | -int cli_ten_minutes_timeout; | ||
99 | +extern int cli_default_conn_timeout; | ||
100 | +extern int cli_ten_minutes_timeout; | ||
101 | |||
102 | typedef enum { | ||
103 | COLD_BRICK_COUNT, | ||
104 | -- | ||
105 | 2.21.0 | ||
106 | |||
diff --git a/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch new file mode 100644 index 0000000..d139ea2 --- /dev/null +++ b/recipes-extended/glusterfs/files/0001-configure-pass-SSL_CERTS.-Don-t-discover-it.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 526b64958b8aabcbad48ffb61f6855b374a68da6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Thu, 25 Jan 2024 18:08:01 +0000 | ||
4 | Subject: [PATCH] configure: pass SSL_CERTS. Don't discover it | ||
5 | |||
6 | Executing the ssl binary to locate the certificates doesn't work | ||
7 | in our environment. Pass it to the build instead. | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 1cda220..fe14134 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -814,6 +814,7 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [ | ||
21 | dnl Find out OpenSSL trusted certificates path | ||
22 | AC_MSG_CHECKING([for OpenSSL trusted certificates path]) | ||
23 | SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|') | ||
24 | +SSL_CERT_PATH="${SSL_CERTS_DIR}" | ||
25 | if test -d "${SSL_CERT_PATH}" 1>/dev/null 2>&1; then | ||
26 | AC_MSG_RESULT([$SSL_CERT_PATH]) | ||
27 | AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.]) | ||
28 | -- | ||
29 | 2.39.2 | ||
30 | |||
diff --git a/recipes-extended/glusterfs/files/CVE-2023-26253.patch b/recipes-extended/glusterfs/files/CVE-2023-26253.patch deleted file mode 100644 index 828c162..0000000 --- a/recipes-extended/glusterfs/files/CVE-2023-26253.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | commit 0cbf51a9827af0e3a35f5cfa823bfa39740bbc58 | ||
2 | Author: mohit84 <moagrawa@redhat.com> | ||
3 | Date: Thu Mar 30 13:02:19 2023 +0530 | ||
4 | Subject: [PATCH] fuse: Resolve asan bug in during receive event notification | ||
5 | (#4024) | ||
6 | |||
7 | The fuse xlator notify function tries to assign data object to graph | ||
8 | object without checking an event. In case of upcall event data object | ||
9 | represents upcall object so during access of graph object the process | ||
10 | crashed for asan build. | ||
11 | |||
12 | Solution: Access the graph->id only while an event is associated | ||
13 | specifically to fuse xlator | ||
14 | |||
15 | > Fixes: #3954 | ||
16 | > Change-Id: I6b2869256b26d22163879737dcf163510d1cd8bf | ||
17 | > Signed-off-by: Mohit Agrawal moagrawa@redhat.com | ||
18 | > (Reviewed on upstream link #4019) | ||
19 | |||
20 | Fixes: #3954 | ||
21 | Change-Id: I6b2869256b26d22163879737dcf163510d1cd8bf | ||
22 | |||
23 | CVE: CVE-2023-26253 | ||
24 | |||
25 | Upstream-Status: Backport [https://github.com/gluster/glusterfs/commit/0cbf51a9827af0e3a35f5cfa823bfa39740bbc58] | ||
26 | |||
27 | Signed-off-by: Soumya <soumya.sambu@windriver.com> | ||
28 | --- | ||
29 | xlators/mount/fuse/src/fuse-bridge.c | 14 +++++++++++--- | ||
30 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
31 | |||
32 | diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c | ||
33 | index c3945d7..0c01a43 100644 | ||
34 | --- a/xlators/mount/fuse/src/fuse-bridge.c | ||
35 | +++ b/xlators/mount/fuse/src/fuse-bridge.c | ||
36 | @@ -6198,6 +6198,7 @@ notify(xlator_t *this, int32_t event, void *data, ...) | ||
37 | int32_t ret = 0; | ||
38 | fuse_private_t *private = NULL; | ||
39 | gf_boolean_t start_thread = _gf_false; | ||
40 | + gf_boolean_t event_graph = _gf_true; | ||
41 | glusterfs_graph_t *graph = NULL; | ||
42 | |||
43 | private | ||
44 | @@ -6205,9 +6206,6 @@ notify(xlator_t *this, int32_t event, void *data, ...) | ||
45 | |||
46 | graph = data; | ||
47 | |||
48 | - gf_log("fuse", GF_LOG_DEBUG, "got event %d on graph %d", event, | ||
49 | - ((graph) ? graph->id : 0)); | ||
50 | - | ||
51 | switch (event) { | ||
52 | case GF_EVENT_GRAPH_NEW: | ||
53 | break; | ||
54 | @@ -6271,9 +6269,19 @@ notify(xlator_t *this, int32_t event, void *data, ...) | ||
55 | } | ||
56 | |||
57 | default: | ||
58 | + /* Set the event_graph to false so that event | ||
59 | + debug msg would not try to access invalid graph->id | ||
60 | + while data object is not matched to graph object | ||
61 | + for ex in case of upcall event data object represents | ||
62 | + gf_upcall object | ||
63 | + */ | ||
64 | + event_graph = _gf_false; | ||
65 | break; | ||
66 | } | ||
67 | |||
68 | + gf_log("fuse", GF_LOG_DEBUG, "got event %d on graph %d", event, | ||
69 | + ((graph && event_graph) ? graph->id : -1)); | ||
70 | + | ||
71 | return ret; | ||
72 | } | ||
73 | |||
74 | -- | ||
75 | 2.35.5 | ||
76 | |||
diff --git a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch index c8e0e7d..7a72e9c 100644 --- a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch +++ b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch | |||
@@ -24,19 +24,16 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> | |||
24 | extras/Makefile.am | 2 +- | 24 | extras/Makefile.am | 2 +- |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
26 | 26 | ||
27 | diff --git a/extras/Makefile.am b/extras/Makefile.am | 27 | Index: glusterfs-11.1/extras/Makefile.am |
28 | index ff5ca9b..1f59746 100644 | 28 | =================================================================== |
29 | --- a/extras/Makefile.am | 29 | --- glusterfs-11.1.orig/extras/Makefile.am |
30 | +++ b/extras/Makefile.am | 30 | +++ glusterfs-11.1/extras/Makefile.am |
31 | @@ -10,7 +10,7 @@ endif | 31 | @@ -10,7 +10,7 @@ |
32 | EditorModedir = $(docdir) | 32 | EditorModedir = $(docdir) |
33 | EditorMode_DATA = glusterfs-mode.el glusterfs.vim | 33 | EditorMode_DATA = glusterfs-mode.el glusterfs.vim |
34 | 34 | ||
35 | -SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ | 35 | -SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ |
36 | +SUBDIRS = benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ | 36 | +SUBDIRS = benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ |
37 | $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python | 37 | $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils python \ |
38 | ganesha command-completion | ||
38 | 39 | ||
39 | confdir = $(sysconfdir)/glusterfs | ||
40 | -- | ||
41 | 2.8.1 | ||
42 | |||
diff --git a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch index e8f99ac..9b807fe 100644 --- a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch +++ b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch | |||
@@ -26,24 +26,24 @@ Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> | |||
26 | geo-replication/src/gsyncd.c | 6 +++--- | 26 | geo-replication/src/gsyncd.c | 6 +++--- |
27 | 3 files changed, 7 insertions(+), 4 deletions(-) | 27 | 3 files changed, 7 insertions(+), 4 deletions(-) |
28 | 28 | ||
29 | diff --git a/configure.ac b/configure.ac | 29 | Index: glusterfs-11.1/configure.ac |
30 | index bc4cf93..d55a7b2 100644 | 30 | =================================================================== |
31 | --- a/configure.ac | 31 | --- glusterfs-11.1.orig/configure.ac |
32 | +++ b/configure.ac | 32 | +++ glusterfs-11.1/configure.ac |
33 | @@ -279,6 +279,8 @@ AC_CANONICAL_HOST | 33 | @@ -261,6 +261,8 @@ |
34 | AC_PROG_CC | 34 | AC_PROG_CC |
35 | AC_DISABLE_STATIC | 35 | AC_DISABLE_STATIC |
36 | AC_PROG_LIBTOOL | 36 | LT_INIT |
37 | +AC_SUBST(TARGET_PYTHON) | 37 | +AC_SUBST(TARGET_PYTHON) |
38 | + | 38 | + |
39 | AC_SUBST([shrext_cmds]) | 39 | AC_SUBST([shrext_cmds]) |
40 | 40 | ||
41 | AC_CHECK_PROG([RPCGEN], [rpcgen], [yes], [no]) | 41 | AC_CHECK_PROG([RPCGEN], [rpcgen], [yes], [no]) |
42 | diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am | 42 | Index: glusterfs-11.1/geo-replication/src/Makefile.am |
43 | index 9937a0b..07456fb 100644 | 43 | =================================================================== |
44 | --- a/geo-replication/src/Makefile.am | 44 | --- glusterfs-11.1.orig/geo-replication/src/Makefile.am |
45 | +++ b/geo-replication/src/Makefile.am | 45 | +++ glusterfs-11.1/geo-replication/src/Makefile.am |
46 | @@ -22,7 +22,8 @@ noinst_HEADERS = procdiggy.h | 46 | @@ -22,7 +22,8 @@ |
47 | AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ | 47 | AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ |
48 | -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ | 48 | -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ |
49 | -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ | 49 | -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \ |
@@ -53,11 +53,11 @@ index 9937a0b..07456fb 100644 | |||
53 | 53 | ||
54 | AM_CFLAGS = -Wall $(GF_CFLAGS) | 54 | AM_CFLAGS = -Wall $(GF_CFLAGS) |
55 | 55 | ||
56 | diff --git a/geo-replication/src/gsyncd.c b/geo-replication/src/gsyncd.c | 56 | Index: glusterfs-11.1/geo-replication/src/gsyncd.c |
57 | index 77af662..8cd0551 100644 | 57 | =================================================================== |
58 | --- a/geo-replication/src/gsyncd.c | 58 | --- glusterfs-11.1.orig/geo-replication/src/gsyncd.c |
59 | +++ b/geo-replication/src/gsyncd.c | 59 | +++ glusterfs-11.1/geo-replication/src/gsyncd.c |
60 | @@ -118,9 +118,9 @@ invoke_gsyncd(int argc, char **argv) | 60 | @@ -115,9 +115,9 @@ |
61 | goto error; | 61 | goto error; |
62 | 62 | ||
63 | j = 0; | 63 | j = 0; |
@@ -69,7 +69,7 @@ index 77af662..8cd0551 100644 | |||
69 | nargv[j++] = python; | 69 | nargv[j++] = python; |
70 | nargv[j++] = GSYNCD_PREFIX "/python/syncdaemon/" GSYNCD_PY; | 70 | nargv[j++] = GSYNCD_PREFIX "/python/syncdaemon/" GSYNCD_PY; |
71 | for (i = 1; i < argc; i++) | 71 | for (i = 1; i < argc; i++) |
72 | @@ -170,7 +170,7 @@ find_gsyncd(pid_t pid, pid_t ppid, char *name, void *data) | 72 | @@ -167,7 +167,7 @@ |
73 | ret = 0; | 73 | ret = 0; |
74 | switch (zeros) { | 74 | switch (zeros) { |
75 | case 2: | 75 | case 2: |
@@ -78,6 +78,3 @@ index 77af662..8cd0551 100644 | |||
78 | strcmp(basename(buf + strlen(buf) + 1), GSYNCD_PY)) == 0) { | 78 | strcmp(basename(buf + strlen(buf) + 1), GSYNCD_PY)) == 0) { |
79 | ret = 1; | 79 | ret = 1; |
80 | break; | 80 | break; |
81 | -- | ||
82 | 2.17.1 | ||
83 | |||