Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fa3f02 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Fix potential null dereference and buffer overrun"

parents 311e3246 19e1fa81

drivers/net/wireless/cnss2/main.c

+4 −4
Original line number Diff line number Diff line
@@ -2122,13 +2122,13 @@ static ssize_t fs_ready_store(struct device *dev, 
	cnss_pr_dbg("File system is ready, fs_ready is %d, count is %zu\n",

		    fs_ready, count);



	if (test_bit(QMI_BYPASS, &plat_priv->ctrl_params.quirks)) {

		cnss_pr_dbg("QMI is bypassed.\n");

	if (!plat_priv) {

		cnss_pr_err("plat_priv is NULL!\n");

		return count;

	}



	if (!plat_priv) {

		cnss_pr_err("plat_priv is NULL!\n");

	if (test_bit(QMI_BYPASS, &plat_priv->ctrl_params.quirks)) {

		cnss_pr_dbg("QMI is bypassed.\n");

		return count;

	}

drivers/net/wireless/cnss2/qmi.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
				     filename, sizeof(filename));

	if (ret > 0) {

		temp = DUMMY_BDF_FILE_NAME;

		remaining = MAX_FIRMWARE_NAME_LEN;

		remaining = strlen(DUMMY_BDF_FILE_NAME) + 1;

		goto bypass_bdf;

	} else if (ret < 0) {

		goto err_req_fw;