| Message ID | 20240719102319.546622-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ae04342b5264fcf90a288a984a69ffb9e93904a7 |
| Headers | show |
| Series | dmaengine: avoid non-constant format string | expand |
On 7/19/24 3:23 AM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Using an arbitrary string as a printf-style format can be a security > problem if that string contains % characters, as the optionalal > -Wformat-security flag points out: > > drivers/dma/dmaengine.c: In function '__dma_async_device_channel_register': > drivers/dma/dmaengine.c:1073:17: error: format not a string literal and no format arguments [-Werror=format-security] > 1073 | dev_set_name(&chan->dev->device, name); > | ^~~~~~~~~~~~ > > Change this newly added instance to use "%s" as the format instead to > pass the actual name. > > Fixes: 10b8e0fd3f72 ("dmaengine: add channel device name to channel registration") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/dma/dmaengine.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c > index c380a4dda77a..c1357d7f3dc6 100644 > --- a/drivers/dma/dmaengine.c > +++ b/drivers/dma/dmaengine.c > @@ -1070,7 +1070,7 @@ static int __dma_async_device_channel_register(struct dma_device *device, > if (!name) > dev_set_name(&chan->dev->device, "dma%dchan%d", device->dev_id, chan->chan_id); > else > - dev_set_name(&chan->dev->device, name); > + dev_set_name(&chan->dev->device, "%s", name); > rc = device_register(&chan->dev->device); > if (rc) > goto err_out_ida;
On Fri, 19 Jul 2024 12:23:12 +0200, Arnd Bergmann wrote: > Using an arbitrary string as a printf-style format can be a security > problem if that string contains % characters, as the optionalal > -Wformat-security flag points out: > > drivers/dma/dmaengine.c: In function '__dma_async_device_channel_register': > drivers/dma/dmaengine.c:1073:17: error: format not a string literal and no format arguments [-Werror=format-security] > 1073 | dev_set_name(&chan->dev->device, name); > | ^~~~~~~~~~~~ > > [...] Applied, thanks! [1/1] dmaengine: avoid non-constant format string commit: ae04342b5264fcf90a288a984a69ffb9e93904a7 Best regards,
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index c380a4dda77a..c1357d7f3dc6 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -1070,7 +1070,7 @@ static int __dma_async_device_channel_register(struct dma_device *device, if (!name) dev_set_name(&chan->dev->device, "dma%dchan%d", device->dev_id, chan->chan_id); else - dev_set_name(&chan->dev->device, name); + dev_set_name(&chan->dev->device, "%s", name); rc = device_register(&chan->dev->device); if (rc) goto err_out_ida;