History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fix from David Miller: "A use-before-NULL-check from Dan Carpenter" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: dbri: move dereference after check for NULL

Linus Torvalds committed 9 years ago

Commit bc3913a2 parents da1b466 163117e1 file · +2 −1Browse files

Unified · Split

sound/sparc/dbri.c+2−1
@@ -1702,7 +1702,7 @@ interrupts are disabled. · 1701 unmodified lines
1702static void xmit_descs(struct snd_dbri *dbri)1702static void xmit_descs(struct snd_dbri *dbri)
1703{1703{
1704 struct dbri_streaminfo *info;1704 struct dbri_streaminfo *info;
1705 u32 dvma_addr = (u32)dbri->dma_dvma;1705 u32 dvma_addr;
1706 s32 *cmd;1706 s32 *cmd;
1707 unsigned long flags;1707 unsigned long flags;
1708 int first_td;1708 int first_td;
@@ -1710,6 +1710,7 @@ static void xmit_descs(struct snd_dbri *dbri) · 1 unmodified line
1710 if (dbri == NULL)1710 if (dbri == NULL)
1711 return; /* Disabled */1711 return; /* Disabled */
1712 1712
1713 dvma_addr = (u32)dbri->dma_dvma;
1713 info = &dbri->stream_info[DBRI_REC];1714 info = &dbri->stream_info[DBRI_REC];
1714 spin_lock_irqsave(&dbri->lock, flags);1715 spin_lock_irqsave(&dbri->lock, flags);
1715 1716