Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3528644pxf; Mon, 15 Mar 2021 11:34:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuX06BQwKnZdnyJ9Nl/STDHeogoJqmY0hflYs8Hkfw96OuupynSt6QTzGh5FznLycLHBnY X-Received: by 2002:aa7:dd98:: with SMTP id g24mr31420077edv.75.1615833259446; Mon, 15 Mar 2021 11:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833259; cv=none; d=google.com; s=arc-20160816; b=wKfj6JffApll20PJ2yU6c/l020NM3bLCC238OJwI9uvveE/cYJ3TehiyXo81JfbSYn N6MYLx66ghfrpvMTaHaBt1xp4AhUeC+X479E3Vk3UW6ruJc1HGt3BDFhlC6xc3aqjQC4 nVe7duvRJM73pJkA/f47h93yjDIAcBhwd8O0wyu6VZxFjtkWl43J6tNcJ1sHspp6f0By eQ3zlXmeK//pwzpgG6QGpDvFp/SUT0/adEEXPtYoU7+Uqjqcp5pix2subPhUvFJi0zXO tB3KFFr+/qx55OPLYINCFd3TlZWevD0kKRdPLibZ1TifMiPaiekcNlH2WmCNZC2efSGB x3XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zHlfu3EXVt+VpFFxJpSGRj6Oz2Q8hyDeDzQBpVdgSWw=; b=g0M/+K9r/pW4nMCym3ULhxKZpN4pbrvFPNpoEls4+i/53G20ktSrhm/s6aRa7CHgkF 67okseRphxd8wxDOps8MkmM7v9abZYKr/nlS0lG99jdarxbODxZrP/hewx7sQSFUMc+u Jix+QEuuDcSPIW1wQ2/uehG6SKyXjq1X3vVyttCZZv4w6aLEsNfa56f8GKOG6+noDRgB 8WlygujY6pb2m9DiozYZvaX+aW99EBRXZey3swG4koCW+2CC0qh6G4WxZd0fzmSJ3S7M Si3//H5ZtTuEpjnkufYwiHIrti1ooB6fcWLq5vpl1jB/YWQu+GFY5RjVEnvNzz6DkzTS isyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Lu7p4VTE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v22si11206125edc.137.2021.03.15.11.33.56; Mon, 15 Mar 2021 11:34:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Lu7p4VTE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238482AbhCOOmi (ORCPT + 99 others); Mon, 15 Mar 2021 10:42:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:49574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234305AbhCOODL (ORCPT ); Mon, 15 Mar 2021 10:03:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C454064E89; Mon, 15 Mar 2021 14:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816990; bh=ZGHqpYg9bmFhxcT4Y1kLePiSwzu/r6PtAwOwk3qAU0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lu7p4VTEegE4JWLh9la+Z3qD7S93NLz3B+aePQumf0AizhFdyWzJc4eWFrKUUz1r/ F7+Xtq19B7RPTtrjdJwfj1SuGStoNGgtmC3w2GrRliHeKrKiFrTfo07KDsr4Tfvg1P Q5iD8hzRixXZFR2wEB16V/0ojCShpPlg/3V8ZxkY= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ian Abbott Subject: [PATCH 5.10 233/290] staging: comedi: addi_apci_1500: Fix endian problem for command sample Date: Mon, 15 Mar 2021 14:55:26 +0100 Message-Id: <20210315135549.860777757@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Ian Abbott commit ac0bbf55ed3be75fde1f8907e91ecd2fd589bde3 upstream. The digital input subdevice supports Comedi asynchronous commands that read interrupt status information. This uses 16-bit Comedi samples (of which only the bottom 8 bits contain status information). However, the interrupt handler is calling `comedi_buf_write_samples()` with the address of a 32-bit variable `unsigned int status`. On a bigendian machine, this will copy 2 bytes from the wrong end of the variable. Fix it by changing the type of the variable to `unsigned short`. Fixes: a8c66b684efa ("staging: comedi: addi_apci_1500: rewrite the subdevice support functions") Cc: #4.0+ Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20210223143055.257402-3-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi_apci_1500.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/drivers/staging/comedi/drivers/addi_apci_1500.c +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c @@ -208,7 +208,7 @@ static irqreturn_t apci1500_interrupt(in struct comedi_device *dev = d; struct apci1500_private *devpriv = dev->private; struct comedi_subdevice *s = dev->read_subdev; - unsigned int status = 0; + unsigned short status = 0; unsigned int val; val = inl(devpriv->amcc + AMCC_OP_REG_INTCSR); @@ -238,14 +238,14 @@ static irqreturn_t apci1500_interrupt(in * * Mask Meaning * ---------- ------------------------------------------ - * 0x00000001 Event 1 has occurred - * 0x00000010 Event 2 has occurred - * 0x00000100 Counter/timer 1 has run down (not implemented) - * 0x00001000 Counter/timer 2 has run down (not implemented) - * 0x00010000 Counter 3 has run down (not implemented) - * 0x00100000 Watchdog has run down (not implemented) - * 0x01000000 Voltage error - * 0x10000000 Short-circuit error + * 0b00000001 Event 1 has occurred + * 0b00000010 Event 2 has occurred + * 0b00000100 Counter/timer 1 has run down (not implemented) + * 0b00001000 Counter/timer 2 has run down (not implemented) + * 0b00010000 Counter 3 has run down (not implemented) + * 0b00100000 Watchdog has run down (not implemented) + * 0b01000000 Voltage error + * 0b10000000 Short-circuit error */ comedi_buf_write_samples(s, &status, 1); comedi_handle_events(dev, s);