dw_mmc: fix multiple drv_data NULL dereferences
Subsystems (2)
PATCH 1/1 dw_mmc: fix multiple drv_data NULL dereferences
Commit 800d78bfccb3d38116abfda2a5b9c8afdbd5ea21 ("mmc: dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.
The above commit introduced multiple NULL pointer dereferences when the default dw_mci_pltfm_probe() is used, as it sets host->drv_data to NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.
--- drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- drivers/mmc/host/dw_mmc.c | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)
drivers/mmc/host/dw_mmc-pltfm.c +2 -2
@@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev,if (!host->regs)return -ENOMEM ; -if (host->drv_data->init) { - ret = host->drv_data->init (host); +if (drv_data && drv_data->init) { + ret = drv_data->init (host);if (ret)return ret; }
drivers/mmc/host/dw_mmc.c +17 -12
@@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;
@@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) cmdr |=SDMMC_CMD_DAT_WR ; } -if (slot->host->drv_data->prepare_command) - slot->host->drv_data->prepare_command (slot->host, &cmdr); +if (drv_data && drv_data->prepare_command) + drv_data->prepare_command (slot->host, &cmdr);return cmdr; }
@@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */
@@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->clock = ios->clock; } -if (slot->host->drv_data->set_ios) - slot->host->drv_data->set_ios (slot->host, ios); +if (drv_data && drv_data->set_ios) + drv_data->set_ios (slot->host, ios);switch (ios->power_mode) {case MMC_POWER_UP :
@@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; +struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;
@@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) }else { ctrl_id =to_platform_device (host->dev)->id; } -if (host->drv_data && host->drv_data->caps) - mmc->caps |= host->drv_data->caps[ctrl_id]; +if (drv_data && drv_data->caps) + mmc->caps |= drv_data->caps[ctrl_id];if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2;
@@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)else bus_width =1 ; -if (host->drv_data->setup_bus) { +if (drv_data && drv_data->setup_bus) {struct device_node *slot_np; slot_np =dw_mci_of_find_slot_node (host->dev, slot->id); - ret = host->drv_data->setup_bus (host, slot_np, bus_width); + ret = drv_data->setup_bus (host, slot_np, bus_width);if (ret) goto err_setup_bus; }
@@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; +struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );
@@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); -if (host->drv_data->parse_dt) { - ret = host->drv_data->parse_dt (host); +if (drv_data && drv_data->parse_dt) { + ret = drv_data->parse_dt (host);if (ret)return ERR_PTR (ret); }
@@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { +struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;
@@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host)else host->bus_hz =clk_get_rate (host->ciu_clk); -if (host->drv_data->setup_clock) { - ret = host->drv_data->setup_clock (host); +if (drv_data && drv_data->setup_clock) { + ret = drv_data->setup_clock (host);if (ret) {dev_err (host->dev,"implementation specific clock setup failed\n" );
Signature · 1 line
1.7.7.6
Quoted 142 lines · James Hogan
Commit
800d78bfccb3d38116abfda2a5b9c8afdbd5ea21("mmc:dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.The above commit introduced multiple NULL pointer dereferences when the default
dw_mci_pltfm_probe()is used, as it setshost->drv_datato NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.Signed-off-by James Hogan <[email protected]>--- drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- drivers/mmc/host/dw_mmc.c | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)drivers/mmc/host/dw_mmc-pltfm.c +2
-2@@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev,if (!host->regs)return -ENOMEM ; -if (host->drv_data->init) { - ret = host->drv_data->init (host); +if (drv_data && drv_data->init) { + ret = drv_data->init (host);if (ret)return ret; }drivers/mmc/host/dw_mmc.c +17
-13@@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;@@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) cmdr |=SDMMC_CMD_DAT_WR ; } -if (slot->host->drv_data->prepare_command) - slot->host->drv_data->prepare_command (slot->host, &cmdr); +if (drv_data && drv_data->prepare_command) + drv_data->prepare_command (slot->host, &cmdr);return cmdr; }@@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */ @@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->clock = ios->clock; } -if (slot->host->drv_data->set_ios) - slot->host->drv_data->set_ios (slot->host, ios); +if (drv_data && drv_data->set_ios) + drv_data->set_ios (slot->host, ios);switch (ios->power_mode) {case MMC_POWER_UP :@@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; +struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;@@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) }else { ctrl_id =to_platform_device (host->dev)->id; } -if (host->drv_data && host->drv_data->caps) - mmc->caps |= host->drv_data->caps[ctrl_id]; +if (drv_data && drv_data->caps) + mmc->caps |= drv_data->caps[ctrl_id];if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2;@@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)else bus_width =1 ; -if (host->drv_data->setup_bus) { +if (drv_data && drv_data->setup_bus) {struct device_node *slot_np; slot_np =dw_mci_of_find_slot_node (host->dev, slot->id); - ret = host->drv_data->setup_bus (host, slot_np, bus_width); + ret = drv_data->setup_bus (host, slot_np, bus_width);if (ret) goto err_setup_bus; }@@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; +struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );@@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); -if (host->drv_data->parse_dt) { - ret = host->drv_data->parse_dt (host); +if (drv_data && drv_data->parse_dt) { + ret = drv_data->parse_dt (host);if (ret)return ERR_PTR (ret); }@@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { +struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;@@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host)else host->bus_hz =clk_get_rate (host->ciu_clk); -if (host->drv_data->setup_clock) { - ret = host->drv_data->setup_clock (host); +if (drv_data && drv_data->setup_clock) { + ret = drv_data->setup_clock (host);if (ret) {dev_err (host->dev,"implementation specific clock setup failed\n" ); --
Quoted 3 lines
1.7.7.6
On Tuesday, October 16, James Hogan <[email protected]>
Quoted 9 lines
Commit
800d78bfccb3d38116abfda2a5b9c8afdbd5ea21("mmc:dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.The above commit introduced multiple NULL pointer dereferences when the default
dw_mci_pltfm_probe()is used, as it setshost->drv_datato NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.Signed-off-by James Hogan <[email protected]>
Looks good to me.
Thanks.
Seungwon Jeon
Looks good to me.
Quoted 142 lines · James Hogan
Commit
800d78bfccb3d38116abfda2a5b9c8afdbd5ea21("mmc:dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.The above commit introduced multiple NULL pointer dereferences when the default
dw_mci_pltfm_probe()is used, as it setshost->drv_datato NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.Signed-off-by James Hogan <[email protected]>--- drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- drivers/mmc/host/dw_mmc.c | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)drivers/mmc/host/dw_mmc-pltfm.c +2
-2@@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev,if (!host->regs)return -ENOMEM ; -if (host->drv_data->init) { - ret = host->drv_data->init (host); +if (drv_data && drv_data->init) { + ret = drv_data->init (host);if (ret)return ret; }drivers/mmc/host/dw_mmc.c +17
-12@@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;@@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) cmdr |=SDMMC_CMD_DAT_WR ; } -if (slot->host->drv_data->prepare_command) - slot->host->drv_data->prepare_command (slot->host, &cmdr); +if (drv_data && drv_data->prepare_command) + drv_data->prepare_command (slot->host, &cmdr);return cmdr; }@@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */ @@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->clock = ios->clock; } -if (slot->host->drv_data->set_ios) - slot->host->drv_data->set_ios (slot->host, ios); +if (drv_data && drv_data->set_ios) + drv_data->set_ios (slot->host, ios);switch (ios->power_mode) {case MMC_POWER_UP :@@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; +struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;@@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) }else { ctrl_id =to_platform_device (host->dev)->id; } -if (host->drv_data && host->drv_data->caps) - mmc->caps |= host->drv_data->caps[ctrl_id]; +if (drv_data && drv_data->caps) + mmc->caps |= drv_data->caps[ctrl_id];if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2;@@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)else bus_width =1 ; -if (host->drv_data->setup_bus) { +if (drv_data && drv_data->setup_bus) {struct device_node *slot_np; slot_np =dw_mci_of_find_slot_node (host->dev, slot->id); - ret = host->drv_data->setup_bus (host, slot_np, bus_width); + ret = drv_data->setup_bus (host, slot_np, bus_width);if (ret) goto err_setup_bus; }@@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; +struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );@@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); -if (host->drv_data->parse_dt) { - ret = host->drv_data->parse_dt (host); +if (drv_data && drv_data->parse_dt) { + ret = drv_data->parse_dt (host);if (ret)return ERR_PTR (ret); }@@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { +struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;@@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host)else host->bus_hz =clk_get_rate (host->ciu_clk); -if (host->drv_data->setup_clock) { - ret = host->drv_data->setup_clock (host); +if (drv_data && drv_data->setup_clock) { + ret = drv_data->setup_clock (host);if (ret) {dev_err (host->dev,"implementation specific clock setup failed\n" );
Will Newton
Acked-byLooks good to me too.
Quoted 152 lines · Jaehoon Chung
Looks good to me.
Acked-by Jaehoon Chung <[email protected]>Quoted 132 lines · James Hogan
Commit
800d78bfccb3d38116abfda2a5b9c8afdbd5ea21("mmc:dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.The above commit introduced multiple NULL pointer dereferences when the default
dw_mci_pltfm_probe()is used, as it setshost->drv_datato NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.Signed-off-by James Hogan <[email protected]>--- drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- drivers/mmc/host/dw_mmc.c | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)drivers/mmc/host/dw_mmc-pltfm.c +2
-2@@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev,if (!host->regs)return -ENOMEM ; -if (host->drv_data->init) { - ret = host->drv_data->init (host); +if (drv_data && drv_data->init) { + ret = drv_data->init (host);if (ret)return ret; }drivers/mmc/host/dw_mmc.c +15
-10@@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;@@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) cmdr |=SDMMC_CMD_DAT_WR ; } -if (slot->host->drv_data->prepare_command) - slot->host->drv_data->prepare_command (slot->host, &cmdr); +if (drv_data && drv_data->prepare_command) + drv_data->prepare_command (slot->host, &cmdr);return cmdr; }@@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */ @@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->clock = ios->clock; } -if (slot->host->drv_data->set_ios) - slot->host->drv_data->set_ios (slot->host, ios); +if (drv_data && drv_data->set_ios) + drv_data->set_ios (slot->host, ios);switch (ios->power_mode) {case MMC_POWER_UP :@@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; +struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;@@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) }else { ctrl_id =to_platform_device (host->dev)->id; } -if (host->drv_data && host->drv_data->caps) - mmc->caps |= host->drv_data->caps[ctrl_id]; +if (drv_data && drv_data->caps) + mmc->caps |= drv_data->caps[ctrl_id];if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2;@@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)else bus_width =1 ; -if (host->drv_data->setup_bus) { +if (drv_data && drv_data->setup_bus) {struct device_node *slot_np; slot_np =dw_mci_of_find_slot_node (host->dev, slot->id); - ret = host->drv_data->setup_bus (host, slot_np, bus_width); + ret = drv_data->setup_bus (host, slot_np, bus_width);if (ret) goto err_setup_bus; }@@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; +struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );@@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); -if (host->drv_data->parse_dt) { - ret = host->drv_data->parse_dt (host); +if (drv_data && drv_data->parse_dt) { + ret = drv_data->parse_dt (host);if (ret)return ERR_PTR (ret); }@@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { +struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;drivers/mmc/host/dw_mmc.c int dw_mci_probe(struct dw_mci *host) · line 2139
Quoted 10 lines
drivers/mmc/host/dw_mmc.c +2
-2@@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host)else host->bus_hz =clk_get_rate (host->ciu_clk); -if (host->drv_data->setup_clock) { - ret = host->drv_data->setup_clock (host); +if (drv_data && drv_data->setup_clock) { + ret = drv_data->setup_clock (host);if (ret) {dev_err (host->dev,"implementation specific clock setup failed\n" );--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Will Newton
Looks good to me too.
Acked-by Will Newton <[email protected]>Quoted 3 lines · Jaehoon Chung
Looks good to me.
Acked-by Jaehoon Chung <[email protected]>
Thanks for the acks Thomas, Seungwon, Jaehoon and Will.
Chris: Any chance of queueing this patch for v3.7?
Thanks
James
Quoted 149 lines
Quoted 149 lines · James Hogan
Quoted 132 lines
Commit
800d78bfccb3d38116abfda2a5b9c8afdbd5ea21("mmc:dw_mmc: add support for implementation specific callbacks") merged in v3.7-rc1.The above commit introduced multiple NULL pointer dereferences when the default
dw_mci_pltfm_probe()is used, as it setshost->drv_datato NULL, and that's only checked against NULL in 1 out of the 7 cases where it is dereferenced.Signed-off-by James Hogan <[email protected]>--- drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- drivers/mmc/host/dw_mmc.c | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-)drivers/mmc/host/dw_mmc-pltfm.c +2
-2@@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev,if (!host->regs)return -ENOMEM ; -if (host->drv_data->init) { - ret = host->drv_data->init (host); +if (drv_data && drv_data->init) { + ret = drv_data->init (host);if (ret)return ret; }drivers/mmc/host/dw_mmc.c +15
-10@@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;@@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) cmdr |=SDMMC_CMD_DAT_WR ; } -if (slot->host->drv_data->prepare_command) - slot->host->drv_data->prepare_command (slot->host, &cmdr); +if (drv_data && drv_data->prepare_command) + drv_data->prepare_command (slot->host, &cmdr);return cmdr; }@@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); +struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */ @@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->clock = ios->clock; } -if (slot->host->drv_data->set_ios) - slot->host->drv_data->set_ios (slot->host, ios); +if (drv_data && drv_data->set_ios) + drv_data->set_ios (slot->host, ios);switch (ios->power_mode) {case MMC_POWER_UP :@@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; +struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;@@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) }else { ctrl_id =to_platform_device (host->dev)->id; } -if (host->drv_data && host->drv_data->caps) - mmc->caps |= host->drv_data->caps[ctrl_id]; +if (drv_data && drv_data->caps) + mmc->caps |= drv_data->caps[ctrl_id];if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2;@@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)else bus_width =1 ; -if (host->drv_data->setup_bus) { +if (drv_data && drv_data->setup_bus) {struct device_node *slot_np; slot_np =dw_mci_of_find_slot_node (host->dev, slot->id); - ret = host->drv_data->setup_bus (host, slot_np, bus_width); + ret = drv_data->setup_bus (host, slot_np, bus_width);if (ret) goto err_setup_bus; }@@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; +struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );@@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)of_property_read_u32 (np,"card-detect-delay" , &pdata->detect_delay_ms); -if (host->drv_data->parse_dt) { - ret = host->drv_data->parse_dt (host); +if (drv_data && drv_data->parse_dt) { + ret = drv_data->parse_dt (host);if (ret)return ERR_PTR (ret); }@@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { +struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;drivers/mmc/host/dw_mmc.c int dw_mci_probe(struct dw_mci *host) · line 2139
Quoted 10 lines
drivers/mmc/host/dw_mmc.c +2
-2@@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host)else host->bus_hz =clk_get_rate (host->ciu_clk); -if (host->drv_data->setup_clock) { - ret = host->drv_data->setup_clock (host); +if (drv_data && drv_data->setup_clock) { + ret = drv_data->setup_clock (host);if (ret) {dev_err (host->dev,"implementation specific clock setup failed\n" );--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 5 lines · James Hogan
Quoted 4 lines · Will Newton
Looks good to me too.
Acked-by Will Newton <[email protected]>
Quoted 8 lines
Quoted 4 lines · Jaehoon Chung
Quoted 3 lines
Looks good to me.
Acked-by Jaehoon Chung <[email protected]>Thanks for the acks Thomas, Seungwon, Jaehoon and Will.
Chris: Any chance of queueing this patch for v3.7?
Yes, certainly -- pushed to mmc-next for 3.7, thanks.
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH 1/1 dw_mmc: fix more const pointer warnings
The patch "dw_mmc: fix multiple drv_data NULL dereferences" has unfortunately clashed with my "mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end" patch, causing new warnings to appear.
This should hopefully fix the issue for good.
---
Quoted 11 lines · Chris Ball
Hi,
Quoted 8 lines · James Hogan
Quoted 7 lines · Will Newton
Looks good to me too.
Acked-by Will Newton <[email protected]>Quoted 2 lines · Jaehoon Chung
Looks good to me.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Acked-by Jaehoon Chung <[email protected]>Thanks for the acks Thomas, Seungwon, Jaehoon and Will.
Chris: Any chance of queueing this patch for v3.7?
Yes, certainly -- pushed to mmc-next for 3.7, thanks.
drivers/mmc/host/dw_mmc.c +5 -5
@@ -232,7 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) {struct mmc_data *data;struct dw_mci_slot *slot =mmc_priv (mmc); -struct dw_mci_drv_data *drv_data = slot->host->drv_data; +const struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 cmdr; cmd->error = -EINPROGRESS ;
@@ -773,7 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)static void dw_mci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct dw_mci_slot *slot =mmc_priv (mmc); -struct dw_mci_drv_data *drv_data = slot->host->drv_data; +const struct dw_mci_drv_data *drv_data = slot->host->drv_data;u32 regs;/* set default 1 bit mode */
@@ -1817,7 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) {struct mmc_host *mmc;struct dw_mci_slot *slot; -struct dw_mci_drv_data *drv_data = host->drv_data; +const struct dw_mci_drv_data *drv_data = host->drv_data;int ctrl_id, ret;u8 bus_width;
@@ -2038,7 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)struct dw_mci_board *pdata;struct device *dev = host->dev;struct device_node *np = dev->of_node; -struct dw_mci_drv_data *drv_data = host->drv_data; +const struct dw_mci_drv_data *drv_data = host->drv_data;int idx, ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );
@@ -2084,7 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)int dw_mci_probe (struct dw_mci *host) { -struct dw_mci_drv_data *drv_data = host->drv_data; +const struct dw_mci_drv_data *drv_data = host->drv_data;int width, i, ret =0 ;u32 fifo_size;int init_slots =0 ;
Re: [PATCH] dw_mmc: fix more const pointer warnings
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
The patch "
dw_mmc: fix multipledrv_dataNULL dereferences" has unfortunately clashed with my "mmc:dw_mmc: constifydw_mci_idmac_opsin exynos back-end" patch, causing new warnings to appear.This should hopefully fix the issue for good.
Signed-off-by Arnd Bergmann <[email protected]>
Thanks, pushed to mmc-next for 3.7.
(Jaehoon also sent a patch to fix these last night, but yours applies to current mmc-next and his doesn't, so I'll take this one instead.)
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Jaehoon Chung
maintainerRe: [PATCH] dw_mmc: fix more const pointer warnings
Great..Thanks Arnd and Chris.
Best Regards,
Jaehoon Chung
Quoted 19 lines · Chris Ball
Hi Arnd,
Quoted 8 lines · Arnd Bergmann
The patch "
dw_mmc: fix multipledrv_dataNULL dereferences" has unfortunately clashed with my "mmc:dw_mmc: constifydw_mci_idmac_opsin exynos back-end" patch, causing new warnings to appear.This should hopefully fix the issue for good.
Signed-off-by Arnd Bergmann <[email protected]>Thanks, pushed to mmc-next for 3.7.
(Jaehoon also sent a patch to fix these last night, but yours applies to current mmc-next and his doesn't, so I'll take this one instead.)
- Chris.