Merge ~vpa1977/ubuntu/+source/atop:armfh_fail into ubuntu/+source/atop:ubuntu/devel

[Vladimir Petko]

Changes:
 - avoid sigfpe due to the truncated shadow file

When the atopacctd service crashes on startup (that is the case for armhf containers), it may leave a 0-length shadow file.
atopacctd() routine tries to read it and fails. It returns 1 (success)
and sets maxshadowrec size to the size from the 'current' file. The rest
of the code assumes that the shadow file read was successful and tries
to use an empty acct structure, causing a division by zero.

PPA: ppa:vpa1977/plusone[1]

Testing:
 - autopkgtest:
  - atop/2.9.0-1ubuntu1~ppa1
    + ✅ atop on mantic for amd64 @ 05.10.23 03:37:41 Log️ 🗒️
    + ✅ atop on mantic for arm64 @ 05.10.23 03:36:38 Log️ 🗒️
    + ✅ atop on mantic for armhf @ 05.10.23 03:36:10 Log️ 🗒️
    + ✅ atop on mantic for ppc64el @ 05.10.23 03:33:14 Log️ 🗒️
    + ✅ atop on mantic for s390x @ 05.10.23 03:32:36 Log️ 🗒️
 - piuparts test[2]
1m39.4s INFO: PASS: All tests.
1m39.4s INFO: piuparts run ends.

[1]https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://bugs.launchpad.net/ubuntu/+source/atop/+bug/2037910/+attachment/5707008/+files/atop.log.gz

[Andreas Hasenack (ahasenack)]

This is the upstream commit now:

https://github.com/Atoptool/atop/commit/f72f7c06278ec9ad2209975eca67c2e3c0b3a44b

They closed the bug[1], but not your PR[2].

This is ready for sponsoring after you update this PR.

1. https://github.com/Atoptool/atop/issues/277
2. https://github.com/Atoptool/atop/pull/278

eee01b9... by Vladimir Petko on 2023-10-08

  * d/p/atopacctd_return_error.patch: apply upstream patch to fix SIGFPE in acctprocnt()

62f931a... by Vladimir Petko on 2023-10-08

changelog: upstream patch

[Vladimir Petko (vpa1977)]

Thank you!

I've updated the branch, not sure if I should rebase it (this will invalidate comments)

[Vladimir Petko (vpa1977)]

Autopkgtest passes with the upstream patch:
  - atop/2.9.0-1ubuntu1~ppa2
    + ✅ atop on mantic for armhf @ 08.10.23 19:36:00 Log️ 🗒️

[Dave Jones (waveform)]

No need to rebase; all looks good now, so I'll sponsor to the archive.

review: Approve

Unmerged commits

62f931a... by Vladimir Petko on 2023-10-08

changelog: upstream patch

eee01b9... by Vladimir Petko on 2023-10-08

  * d/p/atopacctd_return_error.patch: apply upstream patch to fix SIGFPE in acctprocnt()

54a0687... by Vladimir Petko on 2023-10-05

changelog

ca59aed... by Vladimir Petko on 2023-10-05

control

0e0c7ec... by Vladimir Petko on 2023-10-05

  * d/p/atopacctd_return_error.patch: fix SIGFPE in acctprocnt() (LP: #1725896, LP: #2037910).

diff --git a/debian/changelog b/debian/changelog
index 9af1540..44fbd6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+atop (2.9.0-1ubuntu1) mantic; urgency=medium
+
+  * d/p/atopacctd_return_error.patch: apply upstream patch to fix SIGFPE in
+    acctprocnt() (LP: #1725896, LP: #2037910).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 05 Oct 2023 15:25:12 +1300
+
 atop (2.9.0-1) unstable; urgency=medium
 
   * new upstream version 2.9.0
diff --git a/debian/control b/debian/control
index bf0a9a8..4a5f639 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: atop
 Section: admin
 Priority: optional
-Maintainer: Marc Haber <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Marc Haber <[e-mail]>
 Uploaders: Marc Haber <[e-mail]>
 Build-Depends: debhelper-compat (= 13), zlib1g-dev, libncurses-dev
 Standards-Version: 4.6.2
diff --git a/debian/patches/atopacctd_return_error.patch b/debian/patches/atopacctd_return_error.patch
new file mode 100644
index 0000000..cca0cec
--- /dev/null
+++ b/debian/patches/atopacctd_return_error.patch
@@ -0,0 +1,31 @@
+Description: Avoid floating point exception when atopacctd fails
+ When the atopacctd service crashes, it may leave a 0-length shadow file.
+ atopacctd() routine tries to read it and fails. It returns 1 (success)
+ and sets maxshadowrec size to the size from the 'current' file. The rest
+ of the code assumes that the shadow file read was successful and tries
+ to use an empty acct structure, causing a division by zero.
+Author: Gerlof Langeveld <[e-mail]>
+Bug: https://github.com/Atoptool/atop/issues/277
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/atop/+bug/2037910
+Applied-Upstream: https://github.com/Atoptool/atop/commit/f72f7c06278ec9ad2209975eca67c2e3c0b3a44b
+Last-Update: 2023-10-08
+--- a/acctproc.c
++++ b/acctproc.c
+@@ -430,7 +430,6 @@ atopacctd(int swon)
+ 				{
+ 					if ( swon && !acctvers(acctfd) )
+ 					{
+-
+ 						int maxcnt = 40;
+
+ 						if ( fork() == 0 )
+@@ -453,7 +452,8 @@ atopacctd(int swon)
+ 								&semunlock, 1);
+
+ 							regainrootprivs();
+-							return 1;
++							maxshadowrec = 0;
++							return -1;  // try other
+ 						}
+ 					}
+
diff --git a/debian/patches/series b/debian/patches/series
index 2ab4777..24eee56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ atop-pm
 no-atopgpud
 handle-default-file
 default
+atopacctd_return_error.patch