Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3525384pxf; Mon, 15 Mar 2021 11:29:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpAThkRtkTkpyVaw5C6FDiyelAMBgwHSperb1Uuf4OpjpZY1hKolJo3ojDYDfjg9PygktJ X-Received: by 2002:aa7:c9c8:: with SMTP id i8mr31060806edt.193.1615832999320; Mon, 15 Mar 2021 11:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832999; cv=none; d=google.com; s=arc-20160816; b=SqF9M2StliGMM1ZQonQo+QmWsbK/4BsFRIZnPCFSvSuWge6cTt84noqn7Pv9SbD0gE 7B/RTqcTXXYNPxPsYmRtHi3YmVzi5oZuS9xVcPcbTwEb3OKyeUwdmPfhmDoW0wWz1If4 pRlmkA0pZ2HotBGp98CPnusx/IlNpgzvOtRqyIuz1JTfR1CcysZGRTQebQw44WzLYHoP n+/XlZB4/IfyfiRbJnQ4z0rT+PcRnL9+W8sIb+78KuuqpmI5p2MBK8XzANT4tL1TjvR8 dVo3gMWmdg2YZtbctFGuYk7HtFpEd3Oc3dAsd1Z3HQwS1F19G6zB1X5hdvvEffdJNv10 rlvw== 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=A+rOo7S3hMyZBh+EFb6OlpHDNKuBy/+nIzLl0QnhVeU=; b=TYPjF9wkgXvYTFYKqV6M2BmRiZD6VtWUWnh5YSjZpHUnHgL5StA1pEhveXxFLGSXzk Kq8b6NQcCJII/Q7WUXJhLefXrRhUHDtIxpoL5srSYXAj9X0cCNWwUsm4Qs+nWO9gN8FZ B6vD3+RWmA8/Oq31eqMvxGoU4/Cwqu43AieIg08KRYn/SydlBw/DjUASut9b4whfye8z F9T6Asa0C4CqZBoch4uS2c7gn7/m9oOTg0cYKeXJwpHN6pkdtbf2LzeiyMnWHxUG4Z8E d/8KJsemllL+ureLvmbXWzZ/90QlfKuLQbpVPRbZqxn02AAfGbIkqjRDWhgclsEn+BKn YxzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1KrPyw0y; 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 t23si11748446ejj.290.2021.03.15.11.29.35; Mon, 15 Mar 2021 11:29:59 -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=1KrPyw0y; 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 S235596AbhCOObN (ORCPT + 99 others); Mon, 15 Mar 2021 10:31:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:36788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233130AbhCOOAo (ORCPT ); Mon, 15 Mar 2021 10:00:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4364B64E83; Mon, 15 Mar 2021 14:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816832; bh=V7viz8xu8N8sJYEkw/htq8X3o9dPilKEp2U4S6NTMI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1KrPyw0yFAJZ0rXgIoQWFQscT5irPU3KK/zGDvP/PGPjRTkG2+bEuKekWdDtDYvmd Q97P9aOGb1WFPFtNBPJxeqzQN8a2kMbHJ97gPhvmfAqLV2diKIQc4krawkH547uEy2 9NyPi8xdHSDXWmh2qLN5IP58THpX5j2RvzGb10ZU= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ian Abbott Subject: [PATCH 4.19 098/120] staging: comedi: adv_pci1710: Fix endian problem for AI command data Date: Mon, 15 Mar 2021 14:57:29 +0100 Message-Id: <20210315135723.182718088@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135720.002213995@linuxfoundation.org> References: <20210315135720.002213995@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 b2e78630f733a76508b53ba680528ca39c890e82 upstream. The analog input subdevice supports Comedi asynchronous commands that use Comedi's 16-bit sample format. However, the calls to `comedi_buf_write_samples()` are passing the address of a 32-bit integer variable. On bigendian machines, this will copy 2 bytes from the wrong end of the 32-bit value. Fix it by changing the type of the variables holding the sample value to `unsigned short`. The type of the `val` parameter of `pci1710_ai_read_sample()` is changed to `unsigned short *` accordingly. The type of the `val` variable in `pci1710_ai_insn_read()` is also changed to `unsigned short` since its address is passed to `pci1710_ai_read_sample()`. Fixes: a9c3a015c12f ("staging: comedi: adv_pci1710: use comedi_buf_write_samples()") Cc: # 4.0+ Signed-off-by: Ian Abbott Link: https://lore.kernel.org/r/20210223143055.257402-4-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adv_pci1710.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -300,11 +300,11 @@ static int pci1710_ai_eoc(struct comedi_ static int pci1710_ai_read_sample(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int cur_chan, - unsigned int *val) + unsigned short *val) { const struct boardtype *board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; - unsigned int sample; + unsigned short sample; unsigned int chan; sample = inw(dev->iobase + PCI171X_AD_DATA_REG); @@ -345,7 +345,7 @@ static int pci1710_ai_insn_read(struct c pci1710_ai_setup_chanlist(dev, s, &insn->chanspec, 1, 1); for (i = 0; i < insn->n; i++) { - unsigned int val; + unsigned short val; /* start conversion */ outw(0, dev->iobase + PCI171X_SOFTTRG_REG); @@ -395,7 +395,7 @@ static void pci1710_handle_every_sample( { struct comedi_cmd *cmd = &s->async->cmd; unsigned int status; - unsigned int val; + unsigned short val; int ret; status = inw(dev->iobase + PCI171X_STATUS_REG); @@ -455,7 +455,7 @@ static void pci1710_handle_fifo(struct c } for (i = 0; i < devpriv->max_samples; i++) { - unsigned int val; + unsigned short val; int ret; ret = pci1710_ai_read_sample(dev, s, s->async->cur_chan, &val);