From patchwork Wed Dec 26 04:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1018550 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="ixJSBtk+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43PgBH4kcfz9sCX for ; Wed, 26 Dec 2018 15:35:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726038AbeLZEfQ (ORCPT ); Tue, 25 Dec 2018 23:35:16 -0500 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:33054 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725891AbeLZEfP (ORCPT ); Tue, 25 Dec 2018 23:35:15 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 44BE9B9D for ; Wed, 26 Dec 2018 04:35:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MZKwoqawGqBp for ; Tue, 25 Dec 2018 22:35:14 -0600 (CST) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 1784E6A3 for ; Tue, 25 Dec 2018 22:35:14 -0600 (CST) Received: by mail-io1-f70.google.com with SMTP id x2so17999103ioa.23 for ; Tue, 25 Dec 2018 20:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=a1zTTyAyiXIBr/5NtOxbdTp1FWPdqY8wn2FVQPX+AKA=; b=ixJSBtk+xRuzntySWv32XCcDFRGj4wUaxqGqFd7YTgr9P9A1KE6B71yMCaacS63v3D JDRf/MKBrTdPPYP1GE+PZzLDYVgV4/kFzv3qBJkKYE+vMR+Aux4NIjJm3uYj7OsFTQvi uvwylXzoPRRFFXt8zXZ/3ZTMilp9A6iTX48i+AExrFUdYqHj6cOJPn5axo4rHYVQVzxX uNDrljnZFGNaxVeRfusDSb1i6xWPkTI5CsdHVZ7OzZojXXrcvgzUGMdq5wPmZhe5CK1c FOB5Ps7cEFy0SpFnvIN3FkKJ/Xk/2tokazQc8VBJ5hY3/OBZqusWiwaIaXHbG2n2rv2D q54A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a1zTTyAyiXIBr/5NtOxbdTp1FWPdqY8wn2FVQPX+AKA=; b=CAcXzDo1SMKbkAzQtSCYliZP08AJO4cvUu/SNXTD5XqfFkbvsJL/4dosl5iWIE+bK1 ePxvb3JKte49HhD87/LKL+L659KilcYJsp7C9czA9Xt3LVZ6vkHWqxYgV4J+jjcAQJ5t jKMTLYl9WRmAZSMOmDFgX2ubGm3LNFwsuVaKhS7DNVX8Bs8VfX0iWwkryFBsDqSfqz1R Aeekoya7hTMqwWmIL9c8xCfndjCb7kurtHpxH0lF9dRkD3ag2VmxxWbhHC8skyGw6tdK D1rjfKoVoYRyBEtiJSd6DjDNnmLaek04KkQdCg9QXvX4kyyrFaC71BrycSQe/ojIPnYv CuQA== X-Gm-Message-State: AJcUukewJdJT9RCqvXiSWhPY/Z4+cIoadqv1YSsFN0q72yBoVnQTInG2 le0C94ufzgWRm9XfczXez7GiIaVkgp3rCew06SJMjH+Kouj0mn3XcSrmlrgOlH5MRzvc7NFrtGn lBAi3L+SeLrWnwU2NBD/u X-Received: by 2002:a24:b610:: with SMTP id g16mr11368356itf.3.1545798913007; Tue, 25 Dec 2018 20:35:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/WTZ2q8d6ZqEeawPQEs/e0ska0/FyqlbgWU3U8NJeTa6vyaAj8xJbH90GqavhkITjpTJI0sOQ== X-Received: by 2002:a24:b610:: with SMTP id g16mr11368354itf.3.1545798912786; Tue, 25 Dec 2018 20:35:12 -0800 (PST) Received: from localhost.localdomain (host-173-230-104-22.mnmigsc.mn.minneapolis.us.clients.pavlovmedia.net. [173.230.104.22]) by smtp.gmail.com with ESMTPSA id w186sm12085573itb.15.2018.12.25.20.35.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Dec 2018 20:35:12 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wan: fix a missing check of spi_write_then_read Date: Tue, 25 Dec 2018 22:34:41 -0600 Message-Id: <20181226043443.74229-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When spi_write_then_read() fails, "data" can be uninitialized and thus may contain a random value; the following execution checks "data" with a mask, the result could be random. The fix inserts a check of spi_write_then_read(): if it fails, always returns -1. Signed-off-by: Kangjie Lu --- drivers/net/wan/slic_ds26522.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wan/slic_ds26522.c b/drivers/net/wan/slic_ds26522.c index 1f6bc8791d51..89681910d875 100644 --- a/drivers/net/wan/slic_ds26522.c +++ b/drivers/net/wan/slic_ds26522.c @@ -64,8 +64,9 @@ static u8 slic_read(struct spi_device *spi, u16 addr) temp[0] = (u8)(((addr >> 8) & 0x7f) | 0x80); temp[1] = (u8)(addr & 0xfe); - spi_write_then_read(spi, &temp[0], SLIC_TWO_LEN, &data, - SLIC_TRANS_LEN); + if (spi_write_then_read(spi, &temp[0], SLIC_TWO_LEN, &data, + SLIC_TRANS_LEN)) + return -1; data = bitrev8(data); return data;