From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AEA6C10F11 for ; Wed, 24 Apr 2019 17:44:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6834E2064A for ; Wed, 24 Apr 2019 17:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127843; bh=0xEb+Fpf5ckKtBfp98PjpyDNLZQonWrUYjbMkhIz690=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bo/x0Xas3s6pkulc6nxyXOy/NEXcqDORApzTLtQY5cbpdAckzNuj/yfuwIYVJxg44 Q9zAjxx6KCXTWEDeTkj9WBHWCwZtqbmiyec5xixcYi02Ts4qKm9UWROaC1tSc0Iouf O0Vmo5fwI/CJHpy4ZmAEVuUV8qKVBKJ6LLZJYPrY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391836AbfDXRoC (ORCPT ); Wed, 24 Apr 2019 13:44:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:33512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391749AbfDXRej (ORCPT ); Wed, 24 Apr 2019 13:34:39 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 C697521904; Wed, 24 Apr 2019 17:34:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127279; bh=0xEb+Fpf5ckKtBfp98PjpyDNLZQonWrUYjbMkhIz690=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpHPyC43oMv7D/S7I/KeQNZGMGi0jOslAR65SlUelq+oYEe4iahrOFx3adI0AnI/Y 0rtFhB4FNVoTw3v4cvw2IEwSq49Ovc4XKmzujthiRi/EDGIzhcNnazGSvSwOm9bFGC K2ZmINSnKK8s4MTQrmDzx47InZ6j5R022snWP43M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Dirk van der Merwe , Simon Horman , "David S. Miller" Subject: [PATCH 5.0 034/115] net/tls: prevent bad memory access in tls_is_sk_tx_device_offloaded() Date: Wed, 24 Apr 2019 19:09:30 +0200 Message-Id: <20190424170927.037698213@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170924.797924502@linuxfoundation.org> References: <20190424170924.797924502@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Jakub Kicinski [ Upstream commit b4f47f3848eb70986f75d06112af7b48b7f5f462 ] Unlike '&&' operator, the '&' does not have short-circuit evaluation semantics. IOW both sides of the operator always get evaluated. Fix the wrong operator in tls_is_sk_tx_device_offloaded(), which would lead to out-of-bounds access for for non-full sockets. Fixes: 4799ac81e52a ("tls: Add rx inline crypto offload") Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/tls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/net/tls.h +++ b/include/net/tls.h @@ -366,7 +366,7 @@ tls_validate_xmit_skb(struct sock *sk, s static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk) { #ifdef CONFIG_SOCK_VALIDATE_XMIT - return sk_fullsock(sk) & + return sk_fullsock(sk) && (smp_load_acquire(&sk->sk_validate_xmit_skb) == &tls_validate_xmit_skb); #else