[PATCH v2 0/3] staging: comedi: avoid mixing __user and kernel pointers

Ian Abbott abbotti at mev.co.uk
Mon Sep 24 12:34:11 UTC 2012


Some patches from the v1 sequence of 9 patches that were nothing to do
with mixing __user and kernel pointers have already been applied by
Greg, leaving 4 patches unapplied.  For v2, I've combined 2 of those 4
patches, reordered them, slightly modified one of them and changed the
commit messages.

Patch 1 in v2 corresponds to patch 4 in v1.  Patch 2 in v2 corresponds
to patch 9 in v1.  Patch 3 in v2 corresponds to patches 1 and 2 in v1.

I should point out that Dan Carpenter objected to this change in v1 and
nothing has been done to address that in v2.  It's a difference of
opinion.

As remarked in the original patch sequence, one of these patches (patch
2 this time) contains a couple of overlength lines in "pcmmio.c" and
"pcmuio.c" as the affected functions need a serious amount of
refactoring.  At least the patched lines are slightly shorter than the
originals!

Patch 1) staging: comedi: add chanlist to do_cmdtest() handlers
Patch 2) staging: comedi: put command channel list in async structure
Patch 3) staging: comedi: add __user tag to chanlist

 drivers/staging/comedi/comedi.h                    |   2 +-
 drivers/staging/comedi/comedi_fops.c               |  31 +++---
 drivers/staging/comedi/comedidev.h                 |   3 +-
 drivers/staging/comedi/drivers/8255.c              |   3 +-
 .../staging/comedi/drivers/addi-data/addi_common.h |   2 +-
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      |  36 ++++---
 .../comedi/drivers/addi-data/hwdrv_apci3120.h      |   6 +-
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  55 +++++-----
 .../comedi/drivers/addi-data/hwdrv_apci3200.h      |   6 +-
 drivers/staging/comedi/drivers/adl_pci9111.c       |  20 ++--
 drivers/staging/comedi/drivers/adl_pci9118.c       |  15 +--
 drivers/staging/comedi/drivers/adv_pci1710.c       |  15 +--
 drivers/staging/comedi/drivers/amplc_dio200.c      |  12 ++-
 drivers/staging/comedi/drivers/amplc_pc236.c       |   3 +-
 drivers/staging/comedi/drivers/amplc_pci224.c      |  24 +++--
 drivers/staging/comedi/drivers/amplc_pci230.c      |  61 ++++++-----
 drivers/staging/comedi/drivers/cb_das16_cs.c       |   3 +-
 drivers/staging/comedi/drivers/cb_pcidas.c         |  41 ++++----
 drivers/staging/comedi/drivers/cb_pcidas64.c       | 117 +++++++++++----------
 drivers/staging/comedi/drivers/cb_pcidda.c         |   3 +-
 drivers/staging/comedi/drivers/comedi_parport.c    |   3 +-
 drivers/staging/comedi/drivers/comedi_test.c       |  10 +-
 drivers/staging/comedi/drivers/das16.c             |  19 ++--
 drivers/staging/comedi/drivers/das16m1.c           |  12 ++-
 drivers/staging/comedi/drivers/das1800.c           |  29 ++---
 drivers/staging/comedi/drivers/das800.c            |  21 ++--
 drivers/staging/comedi/drivers/dmm32at.c           |  23 ++--
 drivers/staging/comedi/drivers/dt2814.c            |   9 +-
 drivers/staging/comedi/drivers/dt282x.c            |  14 ++-
 drivers/staging/comedi/drivers/dt3000.c            |  13 ++-
 drivers/staging/comedi/drivers/gsc_hpdi.c          |  12 +--
 drivers/staging/comedi/drivers/me4000.c            |  46 ++++----
 drivers/staging/comedi/drivers/me_daq.c            |   3 +-
 drivers/staging/comedi/drivers/ni_6527.c           |   3 +-
 drivers/staging/comedi/drivers/ni_65xx.c           |   3 +-
 drivers/staging/comedi/drivers/ni_660x.c           |   5 +-
 drivers/staging/comedi/drivers/ni_at_a2150.c       |  22 ++--
 drivers/staging/comedi/drivers/ni_atmio16d.c       |  11 +-
 drivers/staging/comedi/drivers/ni_labpc.c          |  52 ++++-----
 drivers/staging/comedi/drivers/ni_mio_common.c     |  58 ++++++----
 drivers/staging/comedi/drivers/ni_pcidio.c         |   6 +-
 drivers/staging/comedi/drivers/ni_tio.h            |   3 +-
 drivers/staging/comedi/drivers/ni_tiocmd.c         |   3 +-
 drivers/staging/comedi/drivers/pcl711.c            |   9 +-
 drivers/staging/comedi/drivers/pcl812.c            |   9 +-
 drivers/staging/comedi/drivers/pcl816.c            |  29 ++---
 drivers/staging/comedi/drivers/pcl818.c            |  28 ++---
 drivers/staging/comedi/drivers/pcm_common.c        |   3 +-
 drivers/staging/comedi/drivers/pcm_common.h        |   3 +-
 drivers/staging/comedi/drivers/pcmmio.c            |  21 ++--
 drivers/staging/comedi/drivers/pcmuio.c            |  21 ++--
 drivers/staging/comedi/drivers/quatech_daqp_cs.c   |   9 +-
 drivers/staging/comedi/drivers/rtd520.c            |  12 ++-
 drivers/staging/comedi/drivers/s626.c              |  26 ++---
 drivers/staging/comedi/drivers/skel.c              |   6 +-
 drivers/staging/comedi/drivers/usbdux.c            |  21 ++--
 drivers/staging/comedi/drivers/usbduxfast.c        |  27 ++---
 drivers/staging/comedi/drivers/usbduxsigma.c       |  16 ++-
 58 files changed, 607 insertions(+), 471 deletions(-)



More information about the devel mailing list