Ubuntu
openssl package

Merge lp:~vicamo/ubuntu/vivid/openssl/switch-to-cntvct into lp:ubuntu/vivid/openssl

  1. Vivid (15.04)
  2. switch-to-cntvct
  3. Merge into vivid
Proposed by You-Sheng Yang
Status: Superseded
Proposed branch: lp:~vicamo/ubuntu/vivid/openssl/switch-to-cntvct
Merge into: lp:ubuntu/vivid/openssl
Diff against target: 38 lines (+26/-0)
2 files modified
debian/patches/armv4cpuid.S-switch-to-CNTVCT-tick-counter.patch (+25/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~vicamo/ubuntu/vivid/openssl/switch-to-cntvct
Reviewer Review Type Date Requested Status
Marc Deslauriers Needs Fixing
Review via email: mp+296749@code.launchpad.net

This proposal has been superseded by a proposal from 2016-06-14.

Description of the change

Use cntvct virtual timer for feature probing on ARM arch. This fixes following error found on Ubuntu Phone devices:

  Jan 1 00:00:47 ubuntu-phablet kernel: [ 38.026652] (2)[2316:ntpdate]USR_MODE / SVC_MODE Undefined Instruction Address curr:ffffffc05596c000 pc=00000000f716f3a8: (null), instr: 0xee190f1d / compat: yes

The patch was formated from https://github.com/openssl/openssl/commit/723463282fab13a686a30779c401b98b82134a62, which has been included in openssl-1.1.0-pre1. Already applied in openssl-1.0.2d-0ubuntu1 in Xenial, too.

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Hi,

The patch looks OK, but you also need to add an entry to debian/changelog.

Thanks!

review: Needs Fixing

Unmerged revisions

112. By You-Sheng Yang

Switch to CNTVCT tick counter on arm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/armv4cpuid.S-switch-to-CNTVCT-tick-counter.patch'
2--- debian/patches/armv4cpuid.S-switch-to-CNTVCT-tick-counter.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/armv4cpuid.S-switch-to-CNTVCT-tick-counter.patch 2016-06-08 02:53:00 +0000
4@@ -0,0 +1,25 @@
5+From e1f81d0ab8a73f1195b4d7f72f3505fa0380eefa Mon Sep 17 00:00:00 2001
6+From: Andy Polyakov <appro@openssl.org>
7+Date: Sun, 1 Jun 2014 22:32:55 +0200
8+Subject: [PATCH] armv4cpuid.S: switch to CNTVCT tick counter.
9+
10+---
11+ crypto/armv4cpuid.S | 2 +-
12+ 1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+diff --git a/crypto/armv4cpuid.S b/crypto/armv4cpuid.S
15+index 2d618de..3f08a9d 100644
16+--- a/crypto/armv4cpuid.S
17++++ b/crypto/armv4cpuid.S
18+@@ -14,7 +14,7 @@ _armv7_neon_probe:
19+ .global _armv7_tick
20+ .type _armv7_tick,%function
21+ _armv7_tick:
22+- mrc p15,0,r0,c9,c13,0
23++ mrrc p15,1,r0,r1,c14 @ CNTVCT
24+ .word 0xe12fff1e @ bx lr
25+ .size _armv7_tick,.-_armv7_tick
26+
27+--
28+2.8.1
29+
30
31=== modified file 'debian/patches/series'
32--- debian/patches/series 2015-03-19 10:07:13 +0000
33+++ debian/patches/series 2016-06-08 02:53:00 +0000
34@@ -78,3 +78,4 @@
35 CVE-2015-0293.patch
36 CVE-2015-0209-2.patch
37 CVE-2015-0293-2.patch
38+armv4cpuid.S-switch-to-CNTVCT-tick-counter.patch

Subscribers

People subscribed via source and target branches