Skip to content

Commit ab705c8

Browse files
ian-abbottgregkh
authored andcommitted
comedi: Fix some signed shift left operations
Correct some left shifts of the signed integer constant 1 by some unsigned number less than 32. Change the constant to 1U to avoid shifting a 1 into the sign bit. The corrected functions are comedi_dio_insn_config(), comedi_dio_update_state(), and __comedi_device_postconfig(). Fixes: e523c6c ("staging: comedi: drivers: introduce comedi_dio_insn_config()") Fixes: 05e60b1 ("staging: comedi: drivers: introduce comedi_dio_update_state()") Fixes: 09567cb ("staging: comedi: initialize subdevice s->io_bits in postconfig") Cc: [email protected] # 5.13+ Signed-off-by: Ian Abbott <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 08ae4b2 commit ab705c8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/comedi/drivers.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ int comedi_dio_insn_config(struct comedi_device *dev,
339339
unsigned int *data,
340340
unsigned int mask)
341341
{
342-
unsigned int chan_mask = 1 << CR_CHAN(insn->chanspec);
342+
unsigned int chan = CR_CHAN(insn->chanspec);
343343

344-
if (!mask)
345-
mask = chan_mask;
344+
if (!mask && chan < 32)
345+
mask = 1U << chan;
346346

347347
switch (data[0]) {
348348
case INSN_CONFIG_DIO_INPUT:
@@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(comedi_dio_insn_config);
382382
unsigned int comedi_dio_update_state(struct comedi_subdevice *s,
383383
unsigned int *data)
384384
{
385-
unsigned int chanmask = (s->n_chan < 32) ? ((1 << s->n_chan) - 1)
385+
unsigned int chanmask = (s->n_chan < 32) ? ((1U << s->n_chan) - 1)
386386
: 0xffffffff;
387387
unsigned int mask = data[0] & chanmask;
388388
unsigned int bits = data[1];
@@ -625,8 +625,8 @@ static int insn_rw_emulate_bits(struct comedi_device *dev,
625625
if (insn->insn == INSN_WRITE) {
626626
if (!(s->subdev_flags & SDF_WRITABLE))
627627
return -EINVAL;
628-
_data[0] = 1 << (chan - base_chan); /* mask */
629-
_data[1] = data[0] ? (1 << (chan - base_chan)) : 0; /* bits */
628+
_data[0] = 1U << (chan - base_chan); /* mask */
629+
_data[1] = data[0] ? (1U << (chan - base_chan)) : 0; /* bits */
630630
}
631631

632632
ret = s->insn_bits(dev, s, &_insn, _data);
@@ -709,7 +709,7 @@ static int __comedi_device_postconfig(struct comedi_device *dev)
709709

710710
if (s->type == COMEDI_SUBD_DO) {
711711
if (s->n_chan < 32)
712-
s->io_bits = (1 << s->n_chan) - 1;
712+
s->io_bits = (1U << s->n_chan) - 1;
713713
else
714714
s->io_bits = 0xffffffff;
715715
}

0 commit comments

Comments
 (0)