Backports Archive on lore.kernel.org
 help / Atom feed
* [PATCH] backports: crypto_memneq has been backported to 3.12 and 3.10
@ 2018-09-10 13:14 Alban Bedel
  2018-10-02 19:24 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Alban Bedel @ 2018-09-10 13:14 UTC (permalink / raw)
  To: hauke, mcgrof; +Cc: backports, Alban Bedel

crypto_memneq has been backported in 3.12.59 and 3.10.106, it
shouldn't be built for these kernels.

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
---
 backport/backport-include/crypto/algapi.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backport/backport-include/crypto/algapi.h b/backport/backport-include/crypto/algapi.h
index b6fbdd9b..ac6ea848 100644
--- a/backport/backport-include/crypto/algapi.h
+++ b/backport/backport-include/crypto/algapi.h
@@ -3,7 +3,9 @@
 #include <linux/version.h>
 #include_next <crypto/algapi.h>
 
-#if LINUX_VERSION_IS_LESS(3,13,0)
+#if LINUX_VERSION_IS_LESS(3,13,0) && \
+    !LINUX_VERSION_IN_RANGE(3,12,59, 3,12,255) && \
+    !LINUX_VERSION_IN_RANGE(3,10,106, 3,10,255)
 #define __crypto_memneq LINUX_BACKPORT(__crypto_memneq)
 noinline unsigned long __crypto_memneq(const void *a, const void *b, size_t size);
 #define crypto_memneq LINUX_BACKPORT(crypto_memneq)
-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] backports: crypto_memneq has been backported to 3.12 and 3.10
  2018-09-10 13:14 [PATCH] backports: crypto_memneq has been backported to 3.12 and 3.10 Alban Bedel
@ 2018-10-02 19:24 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2018-10-02 19:24 UTC (permalink / raw)
  To: Alban Bedel, hauke, mcgrof; +Cc: backports

On Mon, 2018-09-10 at 15:14 +0200, Alban Bedel wrote:
> crypto_memneq has been backported in 3.12.59 and 3.10.106, it
> shouldn't be built for these kernels.

FWIW, I just reverted this - if you actually build with this patch then
you get __crypto_memneq() twice - since we always build memneq.c.

Without the patch, it's renamed to backport___crypto_memneq() and
there's no problem.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-10 13:14 [PATCH] backports: crypto_memneq has been backported to 3.12 and 3.10 Alban Bedel
2018-10-02 19:24 ` Johannes Berg

Backports Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/backports/0 backports/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 backports backports/ https://lore.kernel.org/backports \
		backports@vger.kernel.org backports@archiver.kernel.org
	public-inbox-index backports


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.backports


AGPL code for this site: git clone https://public-inbox.org/ public-inbox