mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: okash.khawaja@gmail.com
Cc: Jiri Slaby <jslaby@suse.com>,
	Samuel Thibault <samuel.thibault@ens-lyon.org>,
	linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
	Kirk Reiser <kirk@reisers.ca>,
	speakup@linux-speakup.org, Chris Brannon <chris@the-brannons.com>
Subject: Re: [patch 1/2] staging: speakup: add function to convert dev name to number
Date: Wed, 14 Jun 2017 12:15:41 +0200	[thread overview]
Message-ID: <20170614101541.GA8065@kroah.com> (raw)
In-Reply-To: <20170614101326.GA7606@kroah.com>

On Wed, Jun 14, 2017 at 12:13:26PM +0200, Greg Kroah-Hartman wrote:
> On Tue, Jun 13, 2017 at 11:37:03PM +0100, okash.khawaja@gmail.com wrote:
> > The function converts strings like ttyS0 and ttyUSB0 to dev_t like
> > (4, 64) and (188, 0). Subsequent patch in this set will call it to
> > convert user-supplied device into device number. The function does
> > some basic sanity checks on the string passed in. It currently supports
> > ttyS*, ttyUSB* and, for selected synths, lp*.
> > 
> > In order to do this, the patch also introduces a string member variable
> > named 'dev' to struct spk_synth. 'dev' represents the device name -
> > ttyUSB0 etc - which needs conversion to dev_t.
> > 
> > Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
> > Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> > 
> > ---
> >  drivers/staging/speakup/spk_priv.h  |    2 
> >  drivers/staging/speakup/spk_ttyio.c |  105 ++++++++++++++++++++++++++++++++++++
> >  drivers/staging/speakup/spk_types.h |    1 
> >  3 files changed, 108 insertions(+)
> > 
> > --- a/drivers/staging/speakup/spk_priv.h
> > +++ b/drivers/staging/speakup/spk_priv.h
> > @@ -40,6 +40,8 @@
> >  
> >  #define KT_SPKUP 15
> >  #define SPK_SYNTH_TIMEOUT 100000 /* in micro-seconds */
> > +#define SYNTH_DEFAULT_DEV "ttyS0"
> > +#define SYNTH_DEFAULT_SER 0
> >  
> >  const struct old_serial_port *spk_serial_init(int index);
> >  void spk_stop_serial_interrupt(void);
> > --- a/drivers/staging/speakup/spk_ttyio.c
> > +++ b/drivers/staging/speakup/spk_ttyio.c
> > @@ -7,6 +7,13 @@
> >  #include "spk_types.h"
> >  #include "spk_priv.h"
> >  
> > +/* Supported device types */
> > +#define DEV_PREFIX_TTYS "ttyS"
> > +#define DEV_PREFIX_TTYUSB "ttyUSB"
> > +#define DEV_PREFIX_LP "lp"
> > +
> > +const char *lp_supported[] = { "acntsa", "bns", "dummy", "txprt" };
> > +
> >  struct spk_ldisc_data {
> >  	char buf;
> >  	struct semaphore sem;
> > @@ -16,6 +23,104 @@ struct spk_ldisc_data {
> >  static struct spk_synth *spk_ttyio_synth;
> >  static struct tty_struct *speakup_tty;
> >  
> > +static int name_to_dev(const char *name, dev_t *dev_no)
> > +{
> > +        int maj = -1, min = -1;
> > +
> > +        if (strncmp(name, DEV_PREFIX_TTYS, strlen(DEV_PREFIX_TTYS)) == 0) {
> > +                if (kstrtoint(name + strlen(DEV_PREFIX_TTYS), 10, &min)) {
> > +			pr_err("speakup: Invalid ser param. Must be \
> > +					between 0 and 191 inclusive.\n");
> > +                        return -EINVAL;
> > +                }
> > +                maj = 4;
> > +
> > +                if (min < 0 || min > 191) {
> > +			pr_err("speakup: Invalid ser param. Must be \
> > +					between 0 and 191 inclusive.\n");
> > +                        return -EINVAL;
> > +                }
> > +                min = min + 64;
> > +        } else if (strncmp(name, DEV_PREFIX_TTYUSB, strlen(DEV_PREFIX_TTYUSB))
> > +			== 0) {
> > +                if (kstrtoint(name + strlen(DEV_PREFIX_TTYUSB), 10, &min)) {
> > +                        pr_err("speakup: Invalid ttyUSB number. \
> > +					Must be a number from 0 onwards\n");
> > +                        return -EINVAL;
> > +                }
> > +                maj = 188;
> > +
> > +                if (min < 0) {
> > +                        pr_err("speakup: Invalid ttyUSB number. \
> > +					Must be a number from 0 onwards\n");
> > +                        return -EINVAL;
> > +                }
> > +        } else if (strncmp(name, DEV_PREFIX_LP, strlen(DEV_PREFIX_LP)) == 0) {
> > +                if (kstrtoint(name + strlen(DEV_PREFIX_LP), 10, &min)) {
> > +                        pr_warn("speakup: Invalid lp number. \
> > +					Must be a number from 0 onwards\n");
> > +                        return -EINVAL;
> > +                }
> > +                maj = 6;
> > +
> > +                if (min < 0) {
> > +                        pr_warn("speakup: Invalid lp number. \
> > +					Must be a number from 0 onwards\n");
> > +                        return -EINVAL;
> > +                }
> > +        }
> > +
> > +        if (maj == -1 || min == -1)
> > +                return -EINVAL;
> > +
> > +        /* if here, maj and min must be valid */
> > +        *dev_no = MKDEV(maj, min);
> > +
> > +        return 0;
> > +}
> 
> Eeek, no, let's never try to parse strings like this and "figure out"
> what major/minor number it is.  That's madness and will break if we ever
> make all char majors dynamic (there's a thread on lkml about that.)
> 
> Why would the kernel need to know major/minor?  Is it going to open a
> device node?  If so, again, crazy stuff, that's not good...

Ah, no, nevermind, you just need the major/minor.  So why not just take
that as the input here, and not a string?

thanks,

greg k-h

  reply	other threads:[~2017-06-14 10:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-13 22:37 [patch 0/2] staging: speakup: support more than ttyS* okash.khawaja
2017-06-13 22:37 ` [patch 1/2] staging: speakup: add function to convert dev name to number okash.khawaja
2017-06-14  8:23   ` Dan Carpenter
2017-06-15  8:17     ` Okash Khawaja
2017-06-14 10:13   ` Greg Kroah-Hartman
2017-06-14 10:15     ` Greg Kroah-Hartman [this message]
2017-06-14 11:26       ` Samuel Thibault
2017-06-14 11:48         ` Greg Kroah-Hartman
2017-06-14 12:18           ` Samuel Thibault
2017-06-14 12:36             ` Andy Shevchenko
2017-06-14 12:46               ` Samuel Thibault
2017-06-14 13:04               ` Greg Kroah-Hartman
2017-06-15  6:52                 ` Okash Khawaja
2017-06-17 10:16                   ` Okash Khawaja
2017-06-17 10:25                     ` Greg Kroah-Hartman
2017-06-17 10:57                       ` Okash Khawaja
2017-06-13 22:37 ` [patch 2/2] staging: speakup: make ttyio synths use device name okash.khawaja

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170614101541.GA8065@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=chris@the-brannons.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=jslaby@suse.com \
    --cc=kirk@reisers.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=okash.khawaja@gmail.com \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=speakup@linux-speakup.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome