Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rspamd for openSUSE:Factory checked
in at 2023-12-08 22:33:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rspamd (Old)
and /work/SRC/openSUSE:Factory/.rspamd.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rspamd"
Fri Dec 8 22:33:19 2023 rev:20 rq:1132069 version:3.7.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/rspamd/rspamd.changes 2023-11-22
18:55:45.382103457 +0100
+++ /work/SRC/openSUSE:Factory/.rspamd.new.25432/rspamd.changes 2023-12-08
22:34:15.460866153 +0100
@@ -1,0 +2,6 @@
+Wed Dec 6 15:28:07 UTC 2023 - Adam Majer <adam.ma...@suse.de>
+
+- fix_stack_smash.patch: upstream rework of logging doesn't allocate
+ enough memory for an array (bsc#1216830)
+
+-------------------------------------------------------------------
New:
----
fix_stack_smash.patch
BETA DEBUG BEGIN:
New:
- fix_stack_smash.patch: upstream rework of logging doesn't allocate
enough memory for an array (bsc#1216830)
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rspamd.spec ++++++
--- /var/tmp/diff_new_pack.sByg52/_old 2023-12-08 22:34:16.416901330 +0100
+++ /var/tmp/diff_new_pack.sByg52/_new 2023-12-08 22:34:16.416901330 +0100
@@ -68,6 +68,7 @@
Patch1: rspamd-after-redis-target.patch
Patch2: fix_missing_return.patch
Patch3: rspamd-d907a95.patch
+Patch4: fix_stack_smash.patch
%if !0%{?is_opensuse}
# because 80-check-malware-scan-clamav triggered in SLE-15-SP2
BuildRequires: -post-build-checks-malwarescan
++++++ fix_stack_smash.patch ++++++
https://bugzilla.suse.com/show_bug.cgi?id=1216830
https://github.com/rspamd/rspamd/pull/4732
The caller uses the value to size its memory allocation:
gsize niov = rspamd_log_fill_iov(NULL, now, module, id, function,
level_flags, message,
mlen,
rspamd_log);
struct iovec *iov = g_alloca(sizeof(struct iovec) * niov);
and that faulted on aarch64.
Index: rspamd-3.7.4/src/libserver/logger/logger.c
===================================================================
--- rspamd-3.7.4.orig/src/libserver/logger/logger.c
+++ rspamd-3.7.4/src/libserver/logger/logger.c
@@ -1046,25 +1046,7 @@ gsize rspamd_log_fill_iov(struct iovec *
gint r;
if (iov == NULL) {
- if (log_rspamadm) {
- if (logger->log_level == G_LOG_LEVEL_DEBUG) {
- return 4;
- }
- else {
- return 3; /* No time component */
- }
- }
- else if (log_systemd) {
- return 3;
- }
- else {
- if (log_color) {
- return 5;
- }
- else {
- return 4;
- }
- }
+ return 5;
}
else {
static gchar timebuf[64], modulebuf[64];
@@ -1197,4 +1179,4 @@ gsize rspamd_log_fill_iov(struct iovec *
return niov;
}
}
-}
\ No newline at end of file
+}
