| Message ID | 20150417131946.GA24502@mwanda (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f4d770317997f89bb6997ee3e8dd495cb8356ae9 |
| Headers | show |
At Fri, 17 Apr 2015 16:19:46 +0300, Dan Carpenter wrote: > > This function is a bit unusual because it accepts negative values as > "conn_len". It's theoretically possible for both "cache_len" and > "conn_len" to be -ENOSPC and in that case we would oops trying to run > memcmp() on the uninitialized "list" pointer. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > v2: Don't print a negative error code as "In-driver Connection." Applied, thanks. Takashi > > diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c > index ee62307..2f00886 100644 > --- a/sound/pci/hda/hda_proc.c > +++ b/sound/pci/hda/hda_proc.c > @@ -582,8 +582,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, > > /* Get Cache connections info */ > cache_len = snd_hda_get_conn_list(codec, nid, &list); > - if (cache_len != conn_len > - || memcmp(list, conn, conn_len)) { > + if (cache_len >= 0 && (cache_len != conn_len || > + memcmp(list, conn, conn_len) != 0)) { > snd_iprintf(buffer, " In-driver Connection: %d\n", cache_len); > if (cache_len > 0) { > snd_iprintf(buffer, " "); >
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index ee62307..2f00886 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -582,8 +582,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, /* Get Cache connections info */ cache_len = snd_hda_get_conn_list(codec, nid, &list); - if (cache_len != conn_len - || memcmp(list, conn, conn_len)) { + if (cache_len >= 0 && (cache_len != conn_len || + memcmp(list, conn, conn_len) != 0)) { snd_iprintf(buffer, " In-driver Connection: %d\n", cache_len); if (cache_len > 0) { snd_iprintf(buffer, " ");
This function is a bit unusual because it accepts negative values as "conn_len". It's theoretically possible for both "cache_len" and "conn_len" to be -ENOSPC and in that case we would oops trying to run memcmp() on the uninitialized "list" pointer. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: Don't print a negative error code as "In-driver Connection."