2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 9d65b371de64..983530ba04a7 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -1158,7 +1158,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev,
         struct device *dev = &ofdev->dev;
         struct crypto4xx_core_device *core_dev;
 
-        rc = of_address_to_resource(ofdev->node, 0, &res);
+        rc = of_address_to_resource(ofdev->dev.of_node, 0, &res);
         if (rc)
                 return -ENODEV;
 
@@ -1215,13 +1215,13 @@ static int __init crypto4xx_probe(struct of_device *ofdev,
                      (unsigned long) dev);
 
         /* Register for Crypto isr, Crypto Engine IRQ */
-        core_dev->irq = irq_of_parse_and_map(ofdev->node, 0);
+        core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0,
                          core_dev->dev->name, dev);
         if (rc)
                 goto err_request_irq;
 
-        core_dev->dev->ce_base = of_iomap(ofdev->node, 0);
+        core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0);
         if (!core_dev->dev->ce_base) {
                 dev_err(dev, "failed to of_iomap\n");
                 goto err_iomap;
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 0f2483e221ad..97f4af1d8a64 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -1183,10 +1183,14 @@ static size_t sg_copy_end_to_buffer(struct scatterlist *sgl, unsigned int nents,
                                 /* Copy part of this segment */
                                 ignore = skip - offset;
                                 len = miter.length - ignore;
+                                if (boffset + len > buflen)
+                                        len = buflen - boffset;
                                 memcpy(buf + boffset, miter.addr + ignore, len);
                         } else {
-                                /* Copy all of this segment */
+                                /* Copy all of this segment (up to buflen) */
                                 len = miter.length;
+                                if (boffset + len > buflen)
+                                        len = buflen - boffset;
                                 memcpy(buf + boffset, miter.addr, len);
                         }
                         boffset += len;