mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Matias Bjørling" <matias@cnexlabs.com>
To: <axboe@fb.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Scott Bauer" <scott.bauer@intel.com>,
	"Matias Bjørling" <matias@cnexlabs.com>
Subject: [GIT PULL 02/19] nvme/lightnvm: Prevent small buffer overflow in nvme_nvm_identify
Date: Sat, 15 Apr 2017 20:55:36 +0200	[thread overview]
Message-ID: <20170415185553.16098-3-matias@cnexlabs.com> (raw)
In-Reply-To: <20170415185553.16098-1-matias@cnexlabs.com>

From: Scott Bauer <scott.bauer@intel.com>

There are two closely named structs in lightnvm:
struct nvme_nvm_addr_format and
struct nvme_addr_format.

The first struct has 4 reserved bytes at the end, the second does not.
(gdb) p sizeof(struct nvme_nvm_addr_format)
$1 = 16
(gdb) p sizeof(struct nvm_addr_format)
$2 = 12

In the nvme_nvm_identify function we memcpy from the larger struct to the
smaller struct. We incorrectly pass the length of the larger struct
and overflow by 4 bytes, lets not do that.

Signed-off-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
---
 drivers/nvme/host/lightnvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 21cac85..fd98954 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -324,7 +324,7 @@ static int nvme_nvm_identity(struct nvm_dev *nvmdev, struct nvm_id *nvm_id)
 	nvm_id->cap = le32_to_cpu(nvme_nvm_id->cap);
 	nvm_id->dom = le32_to_cpu(nvme_nvm_id->dom);
 	memcpy(&nvm_id->ppaf, &nvme_nvm_id->ppaf,
-					sizeof(struct nvme_nvm_addr_format));
+					sizeof(struct nvm_addr_format));
 
 	ret = init_grps(nvm_id, nvme_nvm_id);
 out:
-- 
2.9.3

  parent reply	other threads:[~2017-04-15 18:56 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-15 18:55 [GIT PULL 00/19] LightNVM patches for 4.12 Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 01/19] lightnvm: Fix error handling Matias Bjørling
2017-04-15 18:55 ` Matias Bjørling [this message]
2017-04-15 18:55 ` [GIT PULL 03/19] lightnvm: submit erases using the I/O path Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 04/19] lightnvm: rename scrambler controller hint Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 05/19] lightnvm: free reverse device map Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 06/19] lightnvm: enable nvme size compile asserts Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 07/19] lightnvm: don't check for failure from mempool_alloc() Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 08/19] lightnvm: double-clear of dev->lun_map on target init error Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 09/19] lightnvm: fix cleanup order of disk on " Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 10/19] lightnvm: bad type conversion for nvme control bits Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 11/19] lightnvm: allow to init targets on factory mode Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 12/19] lightnvm: make nvm_free static Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 13/19] lightnvm: clean unused variable Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 14/19] lightnvm: fix type checks on rrpc Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 15/19] lightnvm: convert sprintf into strlcpy Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 16/19] lightnvm: physical block device (pblk) target Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 17/19] lightnvm: pblk-gc: fix an error pointer dereference in init Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 18/19] lightnvm: fix some WARN() messages Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 19/19] lightnvm: fix some error code in pblk-init.c Matias Bjørling
2017-04-16 20:37 ` [GIT PULL 00/19] LightNVM patches for 4.12 Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170415185553.16098-3-matias@cnexlabs.com \
    --to=matias@cnexlabs.com \
    --cc=axboe@fb.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=scott.bauer@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®