lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 073/305] staging: comedi: ni_mio_common: protect register write overflow
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Spencer E. Olson" <olsonse@umich.edu>

    commit 1cbca5852d6c16e85a21487a15d211195aacd4a1 upstream.

    Fixes two problems introduced as early as
    commit 03aef4b6dc12 ("Staging: comedi: add ni_mio_common code"):
    (1) Ensures that the last four bits of NISTC_RTSI_TRIGB_OUT_REG register is
    not unduly overwritten on e-series devices. On e-series devices, the
    first three of the last four bits are reserved. The last bit defines
    the output selection of the RGOUT0 pin, otherwise known as
    RTSI_Sub_Selection. For m-series devices, these last four bits are
    indeed used as the output selection of the RTSI7 pin (and the
    RTSI_Sub_Selection bit for the RGOUT0 pin is moved to the
    RTSI_Trig_Direction register.
    (2) Allows all 4 RTSI_BRD lines to be treated as valid sources for RTSI
    lines.

    This patch also cleans up the ni_get_rtsi_routing command for readability.

    Fixes: 03aef4b6dc12 ("Staging: comedi: add ni_mio_common code")
    Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
    Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.16:
    - Use NI_RTSI_OUTPUT_RTSI_BRD_0 + n instead of NI_RTSI_OUTPUT_RTSI_BRD(n)
    - Use num_configurable_rtsi_channels() instead of NISTC_RTSI_TRIG_NUM_CHAN()
    - Use old_RTSI_clock_channel instead of NISTC_RTSI_TRIG_OLD_CLK_CHAN
    - Adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    .../staging/comedi/drivers/ni_mio_common.c | 24 +++++++++++++------
    1 file changed, 17 insertions(+), 7 deletions(-)

    --- a/drivers/staging/comedi/drivers/ni_mio_common.c
    +++ b/drivers/staging/comedi/drivers/ni_mio_common.c
    @@ -5486,6 +5486,9 @@ static int ni_valid_rtsi_output_source(s
    case NI_RTSI_OUTPUT_G_GATE0:
    case NI_RTSI_OUTPUT_RGOUT0:
    case NI_RTSI_OUTPUT_RTSI_BRD_0:
    + case NI_RTSI_OUTPUT_RTSI_BRD_0 + 1:
    + case NI_RTSI_OUTPUT_RTSI_BRD_0 + 2:
    + case NI_RTSI_OUTPUT_RTSI_BRD_0 + 3:
    return 1;
    break;
    case NI_RTSI_OUTPUT_RTSI_OSC:
    @@ -5513,12 +5516,19 @@ static int ni_set_rtsi_routing(struct co
    RTSI_Trig_Output_Bits(chan, source);
    devpriv->stc_writew(dev, devpriv->rtsi_trig_a_output_reg,
    RTSI_Trig_A_Output_Register);
    - } else if (chan < 8) {
    + } else if (chan < num_configurable_rtsi_channels(dev)) {
    devpriv->rtsi_trig_b_output_reg &= ~RTSI_Trig_Output_Mask(chan);
    devpriv->rtsi_trig_b_output_reg |=
    RTSI_Trig_Output_Bits(chan, source);
    devpriv->stc_writew(dev, devpriv->rtsi_trig_b_output_reg,
    RTSI_Trig_B_Output_Register);
    + } else if (chan != old_RTSI_clock_channel) {
    + /* probably should never reach this, since the
    + * ni_valid_rtsi_output_source above errors out if chan is too
    + * high
    + */
    + dev_err(dev->class_dev, "%s: unknown rtsi channel\n", __func__);
    + return -EINVAL;
    }
    return 2;
    }
    @@ -5533,12 +5543,12 @@ static unsigned ni_get_rtsi_routing(stru
    } else if (chan < num_configurable_rtsi_channels(dev)) {
    return RTSI_Trig_Output_Source(chan,
    devpriv->rtsi_trig_b_output_reg);
    - } else {
    - if (chan == old_RTSI_clock_channel)
    - return NI_RTSI_OUTPUT_RTSI_OSC;
    - printk("%s: bug! should never get here?\n", __func__);
    - return 0;
    + } else if (chan == old_RTSI_clock_channel) {
    + return NI_RTSI_OUTPUT_RTSI_OSC;
    }
    +
    + dev_err(dev->class_dev, "%s: unknown rtsi channel\n", __func__);
    + return -EINVAL;
    }

    static int ni_rtsi_insn_config(struct comedi_device *dev,
    \
     
     \ /
      Last update: 2019-02-03 15:24    [W:2.205 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site