Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp995761yba; Thu, 4 Apr 2019 02:02:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqycLhDDNhkFQKdH4jrKqZDE0InGELQBlFDOydUDSRgDeiu/Bc+dRwU1bxJeyruGo2ke4wtT X-Received: by 2002:a17:902:8c89:: with SMTP id t9mr5167778plo.265.1554368523627; Thu, 04 Apr 2019 02:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554368523; cv=none; d=google.com; s=arc-20160816; b=IGvcfZLBLDPbwsIh9NeOvYqM0XzLJ0aualBuOVYMI+0P53iXqHTdk1jbB/E5icO2Ft U931ie42P8pd6sTShPmN3Ncwt2Mx0orCfPmoUokznBKiobOmDDY2zVmfUThBmqv1fUA6 f4jKzgDczj12PntDF1qB5w58U4sVk6JtyrMbQW/6F2R6L9S+4VZge91pd/bpfPTeh2Gf yIVtX6wphEj6PSdTmuC4LzDbHalpE09lSWdttVRedd8ZkBs/tuAK5kxybrk95NIMalIR H7xc2q85ElYxa91d1+p/yJqpO/lNqySun79iwSyOYFDqBJvadmJeArVr8+2Ij0YJu9nj 0Rcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WTxYQpwdCu7ETrrR+wW4OF1otuDGz0nbZSG2W1UuiIg=; b=fCWzynceyVMhQxrvRkOvgkmRdOJkk25Lr6m3C9/p3Kjun0XAErnsTWpLMpCUI+bHnv YnaS5lrv9jSNFeqQ8GlpSCxO2XHKOeVgEZ7KPehxqFqBJs5YdggVBC79FxKZjV94AwzF bzvvb5AyRt0M6usYebNzwmemU9loTtrma/ykfgMHks2Sew7+xyE5L3O5iJubOWTjHZYk 7nma77tlFQs7RNiYmqwhs16Qrb9EAFRmgMMUvt53MEFtfUY93zdgEqH86AyRzPYX5krj EuKOA6r4aHR2tLJBL0Ic8IamZoTtGnzSk5o5LNmICDykc97zZsIYCtq6Rp4+zAgx73Lv jGkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RTpCvY8k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5si15881217pgc.122.2019.04.04.02.01.48; Thu, 04 Apr 2019 02:02:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RTpCvY8k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731388AbfDDJBO (ORCPT + 99 others); Thu, 4 Apr 2019 05:01:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:38202 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731379AbfDDJBK (ORCPT ); Thu, 4 Apr 2019 05:01:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2830321741; Thu, 4 Apr 2019 09:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368469; bh=Gbe8EMW6sKjfTt8cAs+Xs1WaYXtZxYx8h7t7yONTrk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RTpCvY8kIooZUGB/ncurRfxQclDMMzi4OMWFPesPKhenRfj+5uvbyaVazqBYgP7uc XIBWcA0cpUq2uNSq9CT+mhP/EGD0PO7oAOjfKyCVr05XyiNPchnIzuT3wqp3EEg34P XPdXLcIqluvkRPHY97u7AeO+/Aakq5+DZRlADXy4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mahipal Challa , Jan Glauber , Eric Biggers , Herbert Xu , Sasha Levin Subject: [PATCH 4.19 051/187] crypto: cavium/zip - fix collision with generic cra_driver_name Date: Thu, 4 Apr 2019 10:46:28 +0200 Message-Id: <20190404084605.491942981@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084603.119654039@linuxfoundation.org> References: <20190404084603.119654039@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 41798036430015ad45137db2d4c213cd77fd0251 ] The cavium/zip implementation of the deflate compression algorithm is incorrectly being registered under the generic driver name, which prevents the generic implementation from being registered with the crypto API when CONFIG_CRYPTO_DEV_CAVIUM_ZIP=y. Similarly the lzs algorithm (which does not currently have a generic implementation...) is incorrectly being registered as lzs-generic. Fix the naming collision by adding a suffix "-cavium" to the cra_driver_name of the cavium/zip algorithms. Fixes: 640035a2dc55 ("crypto: zip - Add ThunderX ZIP driver core") Cc: Mahipal Challa Cc: Jan Glauber Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/cavium/zip/zip_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/cavium/zip/zip_main.c b/drivers/crypto/cavium/zip/zip_main.c index be055b9547f6..6183f9128a8a 100644 --- a/drivers/crypto/cavium/zip/zip_main.c +++ b/drivers/crypto/cavium/zip/zip_main.c @@ -351,6 +351,7 @@ static struct pci_driver zip_driver = { static struct crypto_alg zip_comp_deflate = { .cra_name = "deflate", + .cra_driver_name = "deflate-cavium", .cra_flags = CRYPTO_ALG_TYPE_COMPRESS, .cra_ctxsize = sizeof(struct zip_kernel_ctx), .cra_priority = 300, @@ -365,6 +366,7 @@ static struct crypto_alg zip_comp_deflate = { static struct crypto_alg zip_comp_lzs = { .cra_name = "lzs", + .cra_driver_name = "lzs-cavium", .cra_flags = CRYPTO_ALG_TYPE_COMPRESS, .cra_ctxsize = sizeof(struct zip_kernel_ctx), .cra_priority = 300, @@ -384,7 +386,7 @@ static struct scomp_alg zip_scomp_deflate = { .decompress = zip_scomp_decompress, .base = { .cra_name = "deflate", - .cra_driver_name = "deflate-scomp", + .cra_driver_name = "deflate-scomp-cavium", .cra_module = THIS_MODULE, .cra_priority = 300, } @@ -397,7 +399,7 @@ static struct scomp_alg zip_scomp_lzs = { .decompress = zip_scomp_decompress, .base = { .cra_name = "lzs", - .cra_driver_name = "lzs-scomp", + .cra_driver_name = "lzs-scomp-cavium", .cra_module = THIS_MODULE, .cra_priority = 300, } -- 2.19.1